diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-04-08 13:23:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-04-08 13:23:26 -0700 |
| commit | 1b31224e59750f515f7ceb7adab2a7609371327d (patch) | |
| tree | 7e62424501bc30eed85d3990b2b709227d3f25b2 /diffcore.h | |
| parent | Merge branch 'en/sequencer-edit-upon-conflict-fix' (diff) | |
| parent | diffcore-rename: avoid doing basename comparisons for irrelevant sources (diff) | |
| download | git-1b31224e59750f515f7ceb7adab2a7609371327d.tar.gz git-1b31224e59750f515f7ceb7adab2a7609371327d.zip | |
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.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index b9a230ab7f..d76982f220 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); |