From: Phillip Wood Date: Wed, 2 Aug 2017 10:44:18 +0000 (+0100) Subject: t3504: use test_commit X-Git-Tag: v2.14.2~38^2~2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6f0e577e46619a15baefc48192abee34451effa5;p=git t3504: use test_commit Using test_commit is simpler than chaining echo && git add && test_tick && commit. Also having tags makes it clearer which commit is being selecting by reset. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano --- diff --git a/t/t3504-cherry-pick-rerere.sh b/t/t3504-cherry-pick-rerere.sh index e6a64816ef..33f902b1b0 100755 --- a/t/t3504-cherry-pick-rerere.sh +++ b/t/t3504-cherry-pick-rerere.sh @@ -5,14 +5,11 @@ test_description='cherry-pick should rerere for conflicts' . ./test-lib.sh test_expect_success setup ' - echo foo >foo && - git add foo && test_tick && git commit -q -m 1 && - echo foo-master >foo && - git add foo && test_tick && git commit -q -m 2 && - - git checkout -b dev HEAD^ && - echo foo-dev >foo && - git add foo && test_tick && git commit -q -m 3 && + test_commit foo && + test_commit foo-master foo && + + git checkout -b dev foo && + test_commit foo-dev foo && git config rerere.enabled true ' @@ -21,10 +18,10 @@ test_expect_success 'conflicting merge' ' ' test_expect_success 'fixup' ' - echo foo-dev >foo && - git add foo && test_tick && git commit -q -m 4 && - git reset --hard HEAD^ && - echo foo-dev >expect + echo foo-resolved >foo && + git commit -am resolved && + cp foo expect && + git reset --hard HEAD^ ' test_expect_success 'cherry-pick conflict' '