admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge-ort: record the reason that we want a rename for a file

Browse Source 
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>
This commit is contained in:
Elijah Newren
2021-03-13 22:22:07 +00:00
committed by Junio C Hamano
parent bf238b7137
commit ec59da6015
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diffcore.h
View File

@@ -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);