Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
t7503: does pre-commit-hook learn authorship?
[gitweb.git]
/
t
/
t3502-cherry-pick-merge.sh
diff --git
a/t/t3502-cherry-pick-merge.sh
b/t/t3502-cherry-pick-merge.sh
index 0ab52da902c8d602e9c4d64660aa4a7e8e35544f..e37547f41a21ebda150aad6797012c9df3742382 100755
(executable)
--- a/
t/t3502-cherry-pick-merge.sh
+++ b/
t/t3502-cherry-pick-merge.sh
@@
-35,7
+35,7
@@
test_expect_success 'cherry-pick a non-merge with -m should fail' '
git reset --hard &&
git checkout a^0 &&
- test_
must_fail
git cherry-pick -m 1 b &&
+ test_
expect_code 128
git cherry-pick -m 1 b &&
git diff --exit-code a --
'