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 <gitster@pobox.com>
This commit is contained in:
parent
3ba4f3a9fc
commit
c6720cfa49
@ -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' '
|
||||
|
Loading…
Reference in New Issue
Block a user