From: Junio C Hamano Date: Sun, 21 Jun 2009 09:01:28 +0000 (-0700) Subject: t3505: fix abuse of test_expect_code X-Git-Tag: v1.6.3.3~9 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=c6720cfa49fde6d78b010c088a476d226d161983;p=git.git t3505: fix abuse of test_expect_code 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 --- diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index 9aaeabd97..e51e505a9 100755 --- a/t/t3505-cherry-pick-empty.sh +++ b/t/t3505-cherry-pick-empty.sh @@ -17,11 +17,11 @@ test_expect_success setup ' ' -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' '