summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3ba4f3a)
raw | patch | inline | side by side (parent: 3ba4f3a)
author | Junio C Hamano <gitster@pobox.com> | |
Sun, 21 Jun 2009 09:01:28 +0000 (02:01 -0700) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 21 Jun 2009 09:01:28 +0000 (02:01 -0700) |
The test wanted to make sure that cherry-pick exits with status 1,
but with the way it was placed after "git checkout master &&" meant
that it could have misjudged success if checkout barfed with the
same failure status.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
but with the way it was placed after "git checkout master &&" meant
that it could have misjudged success if checkout barfed with the
same failure status.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t3505-cherry-pick-empty.sh | patch | blob | history |
index 9aaeabd972ffd3009fb62b9884516cc876bbb35f..e51e505a9fb902ec7d4cedfa32052f03a04e612e 100755 (executable)
'
-test_expect_code 1 'cherry-pick an empty commit' '
-
- git checkout master &&
- git cherry-pick empty-branch
-
+test_expect_success 'cherry-pick an empty commit' '
+ git checkout master && {
+ git cherry-pick empty-branch
+ test "$?" = 1
+ }
'
test_expect_success 'index lockfile was removed' '