diff options
| author | Elijah Newren <newren@gmail.com> | 2021-02-27 01:30:42 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-02-27 02:53:11 +0100 |
| commit | 0c4fd732f043be570e08b51c475ff9f2e2066912 (patch) | |
| tree | 3571da9673190b17d3badd22f225d1a3f553346c /diffcore.h | |
| parent | diffcore-rename: add a mapping of destination names to their indices (diff) | |
| download | git-0c4fd732f043be570e08b51c475ff9f2e2066912.tar.xz git-0c4fd732f043be570e08b51c475ff9f2e2066912.zip | |
Move computation of dir_rename_count from merge-ort to diffcore-rename
Move the computation of dir_rename_count from merge-ort.c to
diffcore-rename.c, making slight adjustments to the data structures
based on the move. While the diffstat looks large, viewing this commit
with --color-moved makes it clear that only about 20 lines changed.
With this patch, the computation of dir_rename_count is still only done
after inexact rename detection, but subsequent commits will add a
preliminary computation of dir_rename_count after exact rename
detection, followed by some updates after inexact rename detection.
Reviewed-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore.h')
| -rw-r--r-- | diffcore.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index d2a63c5c71..db55d38530 100644 --- a/diffcore.h +++ b/diffcore.h @@ -8,6 +8,8 @@ struct diff_options; struct repository; +struct strmap; +struct strset; struct userdiff_driver; /* This header file is internal between diff.c and its diff transformers @@ -161,6 +163,9 @@ void diff_q(struct diff_queue_struct *, struct diff_filepair *); void diffcore_break(struct repository *, int); void diffcore_rename(struct diff_options *); +void diffcore_rename_extended(struct diff_options *options, + struct strset *dirs_removed, + struct strmap *dir_rename_count); void diffcore_merge_broken(void); void diffcore_pickaxe(struct diff_options *); void diffcore_order(const char *orderfile); |