diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-21 23:50:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-21 23:50:17 -0700 |
| commit | e16a4779b3213f5f734da38a414ec06882400742 (patch) | |
| tree | 9116d524bbdade1da8f61d5c2eed3212e9119514 /t | |
| parent | c5764c095c2a563b657c1bd8f4a3e47bdeee14b0 (diff) | |
| parent | cff4231a1dfbe68b4a163b31406d862567d3243a (diff) | |
| download | git-e16a4779b3213f5f734da38a414ec06882400742.tar.gz | |
Sync with 1.6.3.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | 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 9aaeabd972..e51e505a9f 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' ' |