diff options
author | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:44:54 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-12-28 11:44:54 -0800 |
commit | 9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295 (patch) | |
tree | 43c1df0a83346ce7df327f8cff1c1c2bccdbd88b /t | |
parent | 00754b20f931e0e85fe12e59111cf250d51d288b (diff) | |
parent | 5cd7fadc076880c48a27fd4e5e70844f127ceb99 (diff) | |
download | git-9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295.tar.gz git-9b0b0b4f45bc3d2f12391fe0dd4eaef81db97295.tar.xz |
Merge branch 'jc/checkout-m-twoway' into maint
* jc/checkout-m-twoway:
t/t2023-checkout-m.sh: fix use of test_must_fail
checkout_merged(): squelch false warning from some gcc
Test 'checkout -m -- path'
checkout -m: no need to insist on having all 3 stages
Diffstat (limited to 't')
-rwxr-xr-x | t/t2023-checkout-m.sh | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh new file mode 100755 index 000000000..7e1898513 --- /dev/null +++ b/t/t2023-checkout-m.sh @@ -0,0 +1,49 @@ +#!/bin/sh + +test_description='checkout -m -- <conflicted path> + +Ensures that checkout -m on a resolved file restores the conflicted file' + +. ./test-lib.sh + +test_expect_success setup ' + test_tick && + test_commit both.txt both.txt initial && + git branch topic && + test_commit modified_in_master both.txt in_master && + test_commit added_in_master each.txt in_master && + git checkout topic && + test_commit modified_in_topic both.txt in_topic && + test_commit added_in_topic each.txt in_topic +' + +test_expect_success 'git merge master' ' + test_must_fail git merge master +' + +clean_branchnames () { + # Remove branch names after conflict lines + sed 's/^\([<>]\{5,\}\) .*$/\1/' +} + +test_expect_success '-m restores 2-way conflicted+resolved file' ' + cp each.txt each.txt.conflicted && + echo resolved >each.txt && + git add each.txt && + git checkout -m -- each.txt && + clean_branchnames <each.txt >each.txt.cleaned && + clean_branchnames <each.txt.conflicted >each.txt.conflicted.cleaned && + test_cmp each.txt.conflicted.cleaned each.txt.cleaned +' + +test_expect_success '-m restores 3-way conflicted+resolved file' ' + cp both.txt both.txt.conflicted && + echo resolved >both.txt && + git add both.txt && + git checkout -m -- both.txt && + clean_branchnames <both.txt >both.txt.cleaned && + clean_branchnames <both.txt.conflicted >both.txt.conflicted.cleaned && + test_cmp both.txt.conflicted.cleaned both.txt.cleaned +' + +test_done |