From ec59da6015c457e84953a802fc6484ae2da2d774 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Sat, 13 Mar 2021 22:22:07 +0000 Subject: 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 Signed-off-by: Junio C Hamano --- diffcore.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'diffcore.h') 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); -- cgit v1.2.3