Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
revision: implement sparse algorithm
[gitweb.git]
/
t
/
t3409-rebase-preserve-merges.sh
diff --git
a/t/t3409-rebase-preserve-merges.sh
b/t/t3409-rebase-preserve-merges.sh
index 8c251c57a6827317a9c17fac2a0e99df3c9becf8..3b340f1ece3601b0729d09ea1f976db5b3a8ef65 100755
(executable)
--- a/
t/t3409-rebase-preserve-merges.sh
+++ b/
t/t3409-rebase-preserve-merges.sh
@@
-8,6
+8,11
@@
Run "git rebase -p" and check that merges are properly carried along
'
. ./test-lib.sh
+if ! test_have_prereq REBASE_P; then
+ skip_all='skipping git rebase -p tests, as asked for'
+ test_done
+fi
+
GIT_AUTHOR_EMAIL=bogus_email_address
export GIT_AUTHOR_EMAIL