summaryrefslogtreecommitdiff
path: root/diffcore.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-04-08 20:23:26 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-04-08 20:23:26 (GMT)
commit1b31224e59750f515f7ceb7adab2a7609371327d (patch)
tree7e62424501bc30eed85d3990b2b709227d3f25b2 /diffcore.h
parent82fd285e4606b941bd2bf79be700fb0371599c18 (diff)
parente4fd06e7e2fa9c433597b76245e38e545eec9ec0 (diff)
downloadgit-1b31224e59750f515f7ceb7adab2a7609371327d.zip
git-1b31224e59750f515f7ceb7adab2a7609371327d.tar.gz
git-1b31224e59750f515f7ceb7adab2a7609371327d.tar.bz2
Merge branch 'en/ort-perf-batch-9'
The ort merge backend has been optimized by skipping irrelevant renames. * en/ort-perf-batch-9: diffcore-rename: avoid doing basename comparisons for irrelevant sources merge-ort: skip rename detection entirely if possible merge-ort: use relevant_sources to filter possible rename sources merge-ort: precompute whether directory rename detection is needed merge-ort: introduce wrappers for alternate tree traversal merge-ort: add data structures for an alternate tree traversal merge-ort: precompute subset of sources for which we need rename detection diffcore-rename: enable filtering possible rename sources
Diffstat (limited to 'diffcore.h')
-rw-r--r--diffcore.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h
index b9a230a..d76982f 100644
--- a/diffcore.h
+++ b/diffcore.h
@@ -166,6 +166,7 @@ void partial_clear_dir_rename_count(struct strmap *dir_rename_count);
void diffcore_break(struct repository *, int);
void diffcore_rename(struct diff_options *);
void diffcore_rename_extended(struct diff_options *options,
+ struct strset *relevant_sources,
struct strset *dirs_removed,
struct strmap *dir_rename_count);
void diffcore_merge_broken(void);