From e0052f4613cd8f586b0b9975fedffce268ca6ce9 Mon Sep 17 00:00:00 2001 From: Elijah Newren Date: Wed, 14 Feb 2018 10:52:02 -0800 Subject: merge-recursive: fix overwriting dirty files involved in renames This fixes an issue that existed before my directory rename detection patches that affects both normal renames and renames implied by directory rename detection. Additional codepaths that only affect overwriting of dirty files that are involved in directory rename detection will be added in a subsequent commit. Reviewed-by: Stefan Beller Signed-off-by: Elijah Newren Signed-off-by: Junio C Hamano --- merge-recursive.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'merge-recursive.h') diff --git a/merge-recursive.h b/merge-recursive.h index 50a4e6af4e..d863cf8867 100644 --- a/merge-recursive.h +++ b/merge-recursive.h @@ -1,6 +1,7 @@ #ifndef MERGE_RECURSIVE_H #define MERGE_RECURSIVE_H +#include "unpack-trees.h" #include "string-list.h" struct merge_options { @@ -27,6 +28,7 @@ struct merge_options { struct strbuf obuf; struct hashmap current_file_dir_set; struct string_list df_conflict_file_set; + struct unpack_trees_options unpack_opts; }; /* -- cgit v1.2.3