Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
diff: reuse diff setup for --no-index case
[gitweb.git]
/
t
/
t3414-rebase-preserve-onto.sh
diff --git
a/t/t3414-rebase-preserve-onto.sh
b/t/t3414-rebase-preserve-onto.sh
index ee0a6cccfda832c62233d358f4933e9cd3ab2c8d..72e04b5386a825927f0c9e48d2353fc8c5cf8581 100755
(executable)
--- a/
t/t3414-rebase-preserve-onto.sh
+++ b/
t/t3414-rebase-preserve-onto.sh
@@
-10,6
+10,11
@@
aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM.
'
. ./test-lib.sh
+if ! test_have_prereq REBASE_P; then
+ skip_all='skipping git rebase -p tests, as asked for'
+ test_done
+fi
+
. "$TEST_DIRECTORY"/lib-rebase.sh
# Set up branches like this: