Merge branch 'jt/avoid-ls-refs-with-http'

diff --git a/t/t3414-rebase-preserve-onto.sh b/t/t3414-rebase-preserve-onto.sh
index 80019ee07212a553f97d5fd351f2ee9cfab93d9e..72e04b5386a825927f0c9e48d2353fc8c5cf8581 100755 (executable)
--- a/t/t3414-rebase-preserve-onto.sh
+++ b/t/t3414-rebase-preserve-onto.sh
@@ -10,7 +10,12 @@ aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM.
 '
 . ./test-lib.sh
 
-. ../lib-rebase.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:
 # A1---B1---E1---F1---G1