mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
Merge branch 'js/maint-merge-recursive-r-d-conflict' into maint
* js/maint-merge-recursive-r-d-conflict: merge-recursive: mark rename/delete conflict as unmerged
This commit is contained in:
commit
94468bc1f7
|
@ -934,6 +934,11 @@ static int process_renames(struct merge_options *o,
|
|||
ren1_src, ren1_dst, branch1,
|
||||
branch2);
|
||||
update_file(o, 0, ren1->pair->two->sha1, ren1->pair->two->mode, ren1_dst);
|
||||
update_stages(ren1_dst, NULL,
|
||||
branch1 == o->branch1 ?
|
||||
ren1->pair->two : NULL,
|
||||
branch1 == o->branch1 ?
|
||||
NULL : ren1->pair->two, 1);
|
||||
} else if (!sha_eq(dst_other.sha1, null_sha1)) {
|
||||
const char *new_path;
|
||||
clean_merge = 0;
|
||||
|
|
|
@ -97,4 +97,27 @@ test_expect_success 'refuse to merge binary files' '
|
|||
merge.err
|
||||
'
|
||||
|
||||
test_expect_success 'mark rename/delete as unmerged' '
|
||||
|
||||
git reset --hard &&
|
||||
git checkout -b delete &&
|
||||
git rm a1 &&
|
||||
test_tick &&
|
||||
git commit -m delete &&
|
||||
git checkout -b rename HEAD^ &&
|
||||
git mv a1 a2
|
||||
test_tick &&
|
||||
git commit -m rename &&
|
||||
test_must_fail git merge delete &&
|
||||
test 1 = $(git ls-files --unmerged | wc -l) &&
|
||||
git rev-parse --verify :2:a2 &&
|
||||
test_must_fail git rev-parse --verify :3:a2 &&
|
||||
git checkout -f delete &&
|
||||
test_must_fail git merge rename &&
|
||||
test 1 = $(git ls-files --unmerged | wc -l) &&
|
||||
test_must_fail git rev-parse --verify :2:a2 &&
|
||||
git rev-parse --verify :3:a2
|
||||
|
||||
'
|
||||
|
||||
test_done
|
||||
|
|
Loading…
Reference in a new issue