From: Pete Harlan Date: Wed, 7 Dec 2011 07:01:28 +0000 (-0800) Subject: Test 'checkout -m -- path' X-Git-Tag: v1.7.8.2~3^2~2 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3d0b05176f0539b8d71e712016c367768fc046d5;p=git.git Test 'checkout -m -- path' Signed-off-by: Pete Harlan Signed-off-by: Junio C Hamano --- diff --git a/t/t2023-checkout-m.sh b/t/t2023-checkout-m.sh new file mode 100755 index 000000000..1a40ce02e --- /dev/null +++ b/t/t2023-checkout-m.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +test_description='checkout -m -- + +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_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.cleaned && + clean_branchnames 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.cleaned && + clean_branchnames both.txt.conflicted.cleaned && + test_cmp both.txt.conflicted.cleaned both.txt.cleaned +' + +test_done