diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-06-14 00:28:50 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-14 10:32:02 -0700 |
| commit | 18c8ff46104302ea30e879a0f2cb5eefb94df1a4 (patch) | |
| tree | 6d18767b4cc22a3c2397bd86c1f6e9e70cd1a79f /t/t3508-cherry-pick-many-commits.sh | |
| parent | 86c7bb47c76948bd1240a0db5b8dd88cf9db855d (diff) | |
| download | git-18c8ff46104302ea30e879a0f2cb5eefb94df1a4.tar.gz git-18c8ff46104302ea30e879a0f2cb5eefb94df1a4.tar.xz | |
t3508 (cherry-pick): futureproof against unmerged files
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>
Diffstat (limited to 't/t3508-cherry-pick-many-commits.sh')
| -rwxr-xr-x | t/t3508-cherry-pick-many-commits.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/t/t3508-cherry-pick-many-commits.sh b/t/t3508-cherry-pick-many-commits.sh index 3b87efe3a..26a873032 100755 --- a/t/t3508-cherry-pick-many-commits.sh +++ b/t/t3508-cherry-pick-many-commits.sh @@ -23,7 +23,7 @@ test_expect_success setup ' ' test_expect_success 'cherry-pick first..fourth works' ' - git checkout master && + git checkout -f master && git reset --hard first && test_tick && 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' ' - git checkout master && + git checkout -f master && git reset --hard first && test_tick && 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' ' - git checkout master && + git checkout -f master && git reset --hard first && test_tick && 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' ' - git checkout master && + git checkout -f master && git reset --hard fourth && test_tick && git revert first..fourth && @@ -63,7 +63,7 @@ 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 && test_tick && 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' ' - git checkout master && + git checkout -f master && git reset --hard fourth && test_tick && 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' ' - git checkout master && + git checkout -f master && git reset --hard first && test_tick && git cherry-pick -3 fourth && |