From: Elijah Newren <redacted>
Date: Thu, 3 Dec 2020 15:59:42 +0000 (+0000)
Subject: merge-ort: add a path_conflict field to merge_options_internal
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=1c7873cdf4a7e84755c54e3f9ef10599041565d0;p=git.git

merge-ort: add a path_conflict field to merge_options_internal

This field is not yet used, but will be used by both the rename handling
code, and the conflict type handling code in process_entry().

Signed-off-by: Elijah Newren <redacted>
Signed-off-by: Junio C Hamano <redacted>
---

diff --git a/merge-ort.c b/merge-ort.c
index ced6be1f9f..d88307489b 100644
--- a/merge-ort.c
+++ b/merge-ort.c
@@ -165,6 +165,13 @@ struct conflict_info {
 	/* Whether this path is/was involved in a directory/file conflict */
 	unsigned df_conflict:1;
 
+	/*
+	 * Whether this path is/was involved in a non-content conflict other
+	 * than a directory/file conflict (e.g. rename/rename, rename/delete,
+	 * file location based on possible directory rename).
+	 */
+	unsigned path_conflict:1;
+
 	/*
 	 * For filemask and dirmask, the ith bit corresponds to whether the
 	 * ith entry is a file (filemask) or a directory (dirmask).  Thus,