undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t3504: use test_commit

Browse Source 
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 <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Phillip Wood 2017-08-02 11:44:18 +01:00 committed by Junio C Hamano
parent 9b6d7a6245
commit 6f0e577e46
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
t/t3504-cherry-pick-rerere.sh
View File

@ -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 &&
test_commit foo &&
test_commit foo-master foo &&
git checkout -b dev HEAD^ &&
echo foo-dev >foo &&
git add foo && test_tick && git commit -q -m 3 &&
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' '