diff options
| author | Junio C Hamano <gitster@pobox.com> | 2021-06-14 07:33:26 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-06-14 07:33:27 +0300 |
| commit | 169914ede2aa205c5500c7be0501889a8962dc24 (patch) | |
| tree | b49d4264fd7a9ceb71b032eca131622c6447eb5b /diffcore.h | |
| parent | 4dd75a195b06680cf43dd7c116b53a561ae8d11c (diff) | |
| parent | 25e65b6dd52c987056f1cac00fe6073fbf8ea237 (diff) | |
Merge branch 'en/ort-perf-batch-11'
Optimize out repeated rename detection in a sequence of mergy
operations.
* en/ort-perf-batch-11:
merge-ort, diffcore-rename: employ cached renames when possible
merge-ort: handle interactions of caching and rename/rename(1to1) cases
merge-ort: add helper functions for using cached renames
merge-ort: preserve cached renames for the appropriate side
merge-ort: avoid accidental API mis-use
merge-ort: add code to check for whether cached renames can be reused
merge-ort: populate caches of rename detection results
merge-ort: add data structures for in-memory caching of rename detection
t6429: testcases for remembering renames
fast-rebase: write conflict state to working tree, index, and HEAD
fast-rebase: change assert() to BUG()
Documentation/technical: describe remembering renames optimization
t6423: rename file within directory that other side renamed
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/diffcore.h b/diffcore.h index f5c6de4841..533b30e21e 100644 --- a/diffcore.h +++ b/diffcore.h @@ -181,7 +181,8 @@ void diffcore_rename(struct diff_options *); void diffcore_rename_extended(struct diff_options *options, struct strintmap *relevant_sources, struct strintmap *dirs_removed, - struct strmap *dir_rename_count); + struct strmap *dir_rename_count, + struct strmap *cached_pairs); void diffcore_merge_broken(void); void diffcore_pickaxe(struct diff_options *); void diffcore_order(const char *orderfile); |