development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 13:24:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

merge-recursive: fix remaining directory rename + dirty overwrite cases

Browse source 
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:03 -08:00 committed by Junio C Hamano
parent e0052f4613
commit bbafab7f32
2 changed files with 26 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
merge-recursive.c
View file

@ -1314,11 +1314,22 @@ static int handle_file(struct merge_options *o,
add = filespec_from_entry(&other, dst_entry, stage ^ 1);
if (add) {
int ren_src_was_dirty = was_dirty(o, rename->path);
char *add_name = unique_path(o, rename->path, other_branch);
if (update_file(o, 0, &add->oid, add->mode, add_name))
return -1;
remove_file(o, 0, rename->path, 0);
if (ren_src_was_dirty) {
output(o, 1, _("Refusing to lose dirty file at %s"),
rename->path);
}
/*
* Because the double negatives somehow keep confusing me...
* 1) update_wd iff !ren_src_was_dirty.
* 2) no_wd iff !update_wd
* 3) so, no_wd == !!ren_src_was_dirty == ren_src_was_dirty
*/
remove_file(o, 0, rename->path, ren_src_was_dirty);
dst_name = unique_path(o, rename->path, cur_branch);
} else {
if (dir_in_way(rename->path, !o->call_depth, 0)) {
@ -1456,7 +1467,10 @@ static int conflict_rename_rename_2to1(struct merge_options *o,
char *new_path2 = unique_path(o, path, ci->branch2);
output(o, 1, _("Renaming %s to %s and %s to %s instead"),
a->path, new_path1, b->path, new_path2);
if (would_lose_untracked(path))
if (was_dirty(o, path))
output(o, 1, _("Refusing to lose dirty file at %s"),
path);
else if (would_lose_untracked(path))
/*
* Only way we get here is if both renames were from
* a directory rename AND user had an untracked file
@ -2065,6 +2079,7 @@ static void apply_directory_rename_modifications(struct merge_options *o,
{
struct string_list_item *item;
int stage = (tree == a_tree ? 2 : 3);
int update_wd;
/*
* In all cases where we can do directory rename detection,
@ -2075,7 +2090,11 @@ static void apply_directory_rename_modifications(struct merge_options *o,
* saying the file would have been overwritten), but it might
* be dirty, though.
*/
remove_file(o, 1, pair->two->path, 0 /* no_wd */);
update_wd = !was_dirty(o, pair->two->path);
if (!update_wd)
output(o, 1, _("Refusing to lose dirty file at %s"),
pair->two->path);
remove_file(o, 1, pair->two->path, !update_wd);
/* Find or create a new re->dst_entry */
item = string_list_lookup(entries, new_path);

8
t/t6043-merge-rename-directories.sh
View file

@ -3370,7 +3370,7 @@ test_expect_success '11b-setup: Avoid losing dirty file involved in directory re
)
'
test_expect_failure '11b-check: Avoid losing dirty file involved in directory rename' '
test_expect_success '11b-check: Avoid losing dirty file involved in directory rename' '
(
cd 11b &&
@ -3512,7 +3512,7 @@ test_expect_success '11d-setup: Avoid losing not-uptodate with rename + D/F conf
)
'
test_expect_failure '11d-check: Avoid losing not-uptodate with rename + D/F conflict' '
test_expect_success '11d-check: Avoid losing not-uptodate with rename + D/F conflict' '
(
cd 11d &&
@ -3591,7 +3591,7 @@ test_expect_success '11e-setup: Avoid deleting not-uptodate with dir rename/rena
)
'
test_expect_failure '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
test_expect_success '11e-check: Avoid deleting not-uptodate with dir rename/rename(1to2)/add' '
(
cd 11e &&
@ -3667,7 +3667,7 @@ test_expect_success '11f-setup: Avoid deleting not-uptodate with dir rename/rena
)
'
test_expect_failure '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
test_expect_success '11f-check: Avoid deleting not-uptodate with dir rename/rename(2to1)' '
(
cd 11f &&