Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'cc/fetch-error-message-fix'
[gitweb.git]
/
t
/
t7505-prepare-commit-msg-hook.sh
diff --git
a/t/t7505-prepare-commit-msg-hook.sh
b/t/t7505-prepare-commit-msg-hook.sh
index 1f43b3cd4cd34ec6f4c3de4cfe8a26291e4e480f..ebfcad9c4c7d3c6766907d76c5e0c794a0720e1c 100755
(executable)
--- a/
t/t7505-prepare-commit-msg-hook.sh
+++ b/
t/t7505-prepare-commit-msg-hook.sh
@@
-253,7
+253,7
@@
test_rebase () {
}
test_rebase success -i
-test_rebase success -p
+test_
have_prereq !REBASE_P || test_
rebase success -p
test_expect_success 'with hook (cherry-pick)' '
test_when_finished "git checkout -f master" &&