X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft3505-cherry-pick-empty.sh;h=e51e505a9fb902ec7d4cedfa32052f03a04e612e;hb=03f94ae9f909952ed5a78917ab319a312889354b;hp=9aaeabd972ffd3009fb62b9884516cc876bbb35f;hpb=2c8f8b19d4f293edd78885880ed1a6166395ffdd;p=git.git 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' '