From: Junio C Hamano Date: Sun, 21 Jun 2009 09:14:17 GMT Subject: [PATCH] t3505: fix abuse of test_expect_code Message-ID: <7v7hz6t0d2.fsf@alter.siamese.dyndns.org> 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 --- * Besides, /bin/sh (but not bash) on FreeBSD 7.2 does not seem to evaluate "a && b" fed to test_expect_code correctly for me (eval_ret=0 for some reason, even though cherry-pick was failing), and this patch incidentally fixes that issue. t/t3505-cherry-pick-empty.sh | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t3505-cherry-pick-empty.sh b/t/t3505-cherry-pick-empty.sh index 9aaeabd..e51e505 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' '