summaryrefslogtreecommitdiff
path: root/t/t3505-cherry-pick-empty.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-06-22 06:50:17 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-06-22 06:50:17 (GMT)
commite16a4779b3213f5f734da38a414ec06882400742 (patch)
tree9116d524bbdade1da8f61d5c2eed3212e9119514 /t/t3505-cherry-pick-empty.sh
parentc5764c095c2a563b657c1bd8f4a3e47bdeee14b0 (diff)
parentcff4231a1dfbe68b4a163b31406d862567d3243a (diff)
downloadgit-e16a4779b3213f5f734da38a414ec06882400742.zip
git-e16a4779b3213f5f734da38a414ec06882400742.tar.gz
git-e16a4779b3213f5f734da38a414ec06882400742.tar.bz2
Sync with 1.6.3.3
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3505-cherry-pick-empty.sh')
-rwxr-xr-xt/t3505-cherry-pick-empty.sh10
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' '