diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:15:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-01-13 01:15:19 -0800 |
| commit | 94468bc1f719b7e0009ec0600b178dd5f412d702 (patch) | |
| tree | d575fed066ab542840be3ec793fb523491e16677 /t | |
| parent | 9e8f6e7f6e8817db30a492e32fa92c1daf51b77c (diff) | |
| parent | 36e3b5eafe967cb721f5e2bbaa396f979b8ebd7c (diff) | |
| download | git-94468bc1f719b7e0009ec0600b178dd5f412d702.tar.gz git-94468bc1f719b7e0009ec0600b178dd5f412d702.tar.xz | |
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
Diffstat (limited to 't')
| -rwxr-xr-x | t/t6024-recursive-merge.sh | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 802d0d06e..129fa3000 100755 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -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 |