diff options
| author | Elijah Newren <newren@gmail.com> | 2021-03-14 01:22:07 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-03-19 00:32:56 +0300 |
| commit | ec59da6015c457e84953a802fc6484ae2da2d774 (patch) | |
| tree | 7fd53279daab6f796b5c7d5422c13e34d9ab76e2 /diffcore.h | |
| parent | bf238b71377e924066ca5155a787c167177f706c (diff) | |
merge-ort: record the reason that we want a rename for a file
There are two different reasons we might want a rename for a file -- for
three-way content merging or as part of directory rename detection.
Record the reason. diffcore-rename will potentially be able to filter
some of the ones marked as needed only for directory rename detection,
if it can determine those directory renames based solely on renames
found via exact rename detection and basename-guided rename detection.
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 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/diffcore.h b/diffcore.h index d5a497b7a1..cf8d4cb861 100644 --- a/diffcore.h +++ b/diffcore.h @@ -167,6 +167,12 @@ enum dir_rename_relevance { RELEVANT_FOR_ANCESTOR = 1, RELEVANT_FOR_SELF = 2 }; +/* file_rename_relevance: the reason(s) we want rename information for a file */ +enum file_rename_relevance { + RELEVANT_NO_MORE = 0, /* i.e. NOT relevant */ + RELEVANT_CONTENT = 1, + RELEVANT_LOCATION = 2 +}; void partial_clear_dir_rename_count(struct strmap *dir_rename_count); |