[PATCH 3/7] merge-ort: add a path_conflict field to merge_options_internal
From: Elijah Newren via GitGitGadget <hidden>
Date: 2020-12-03 16:01:01
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Elijah Newren <redacted> 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> --- merge-ort.c | 7 +++++++ 1 file changed, 7 insertions(+)
diff --git a/merge-ort.c b/merge-ort.c
index 0654c76c8c..bcd53d3799 100644
--- a/merge-ort.c
+++ b/merge-ort.c@@ -148,6 +148,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, see tree-walk.h's struct traverse_info, * particularly the documentation above the "fn" member. Note that
--
gitgitgadget