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

t3508 (cherry-pick): futureproof against unmerged files

Browse Source 
Each of the tests in t3508 begins by navigating to a sane state:

	git checkout master &&
	git reset --hard $commit

If a previous test left unmerged files around, they are untouched and
the checkout fails, causing later tests to fail, too.  This is not a
problem in practice because no test except the final one produces
unmerged files.

But as a futureproofing measure, it is still best to avoid the problem
with 'checkout -f'.  In particular, this is needed for new tests to be
added to the end of the script.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jonathan Nieder 2010-06-14 00:28:50 -05:00 committed by Junio C Hamano
parent 86c7bb47c7
commit 18c8ff4610
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
t/t3508-cherry-pick-many-commits.sh
View File

@ -23,7 +23,7 @@ test_expect_success setup '
' '
test_expect_success 'cherry-pick first..fourth works' ' test_expect_success 'cherry-pick first..fourth works' '
git checkout master && git checkout -f master &&
git reset --hard first && git reset --hard first &&
test_tick && test_tick &&
git cherry-pick first..fourth && git cherry-pick first..fourth &&
@ -33,7 +33,7 @@ test_expect_success 'cherry-pick first..fourth works' '
' '
test_expect_success 'cherry-pick --ff first..fourth works' ' test_expect_success 'cherry-pick --ff first..fourth works' '
git checkout master && git checkout -f master &&
git reset --hard first && git reset --hard first &&
test_tick && test_tick &&
git cherry-pick --ff first..fourth && git cherry-pick --ff first..fourth &&
@ -43,7 +43,7 @@ test_expect_success 'cherry-pick --ff first..fourth works' '
' '
test_expect_success 'cherry-pick -n first..fourth works' ' test_expect_success 'cherry-pick -n first..fourth works' '
git checkout master && git checkout -f master &&
git reset --hard first && git reset --hard first &&
test_tick && test_tick &&
git cherry-pick -n first..fourth && git cherry-pick -n first..fourth &&
@ -53,7 +53,7 @@ test_expect_success 'cherry-pick -n first..fourth works' '
' '
test_expect_success 'revert first..fourth works' ' test_expect_success 'revert first..fourth works' '
git checkout master && git checkout -f master &&
git reset --hard fourth && git reset --hard fourth &&
test_tick && test_tick &&
git revert first..fourth && git revert first..fourth &&
@ -63,7 +63,7 @@ test_expect_success 'revert first..fourth works' '
' '
test_expect_success 'revert ^first fourth works' ' test_expect_success 'revert ^first fourth works' '
git checkout master && git checkout -f master &&
git reset --hard fourth && git reset --hard fourth &&
test_tick && test_tick &&
git revert ^first fourth && git revert ^first fourth &&
@ -73,7 +73,7 @@ test_expect_success 'revert ^first fourth works' '
' '
test_expect_success 'revert fourth fourth~1 fourth~2 works' ' test_expect_success 'revert fourth fourth~1 fourth~2 works' '
git checkout master && git checkout -f master &&
git reset --hard fourth && git reset --hard fourth &&
test_tick && test_tick &&
git revert fourth fourth~1 fourth~2 && git revert fourth fourth~1 fourth~2 &&
@ -83,7 +83,7 @@ test_expect_success 'revert fourth fourth~1 fourth~2 works' '
' '
test_expect_failure 'cherry-pick -3 fourth works' ' test_expect_failure 'cherry-pick -3 fourth works' '
git checkout master && git checkout -f master &&
git reset --hard first && git reset --hard first &&
test_tick && test_tick &&
git cherry-pick -3 fourth && git cherry-pick -3 fourth &&