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

merge-recursive: fix overwriting dirty files involved in renames

Browse Source 
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 <sbeller@google.com>
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Elijah Newren
2018-02-14 10:52:02 -08:00
committed by Junio C Hamano
parent 7b3d3b0681
commit e0052f4613
7 changed files with 77 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
merge-recursive.h
View File

@ -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;
};
/*