diff options
| author | Elijah Newren <newren@gmail.com> | 2020-12-13 08:04:14 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-12-13 14:18:20 -0800 |
| commit | 885f0063e9962068d381ca5256ca49070bb2480c (patch) | |
| tree | 35056ec899a130d8d8bc796ffa432f185273ba53 /commit.c | |
| parent | merge-ort: implement a very basic collect_merge_info() (diff) | |
| download | git-885f0063e9962068d381ca5256ca49070bb2480c.tar.gz git-885f0063e9962068d381ca5256ca49070bb2480c.zip | |
merge-ort: avoid repeating fill_tree_descriptor() on the same tree
Three-way merges, by their nature, are going to often have two or more
trees match at a given subdirectory. We can avoid calling
fill_tree_descriptor() on the same tree by checking when these trees
match. Noting when various oids match will also be useful in other
calculations and optimizations as well.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions