projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] New git-apply test cases for scanning forwards and backwards.
[git.git]
/
t
/
t6001-rev-list-merge-order.sh
diff --git
a/t/t6001-rev-list-merge-order.sh
b/t/t6001-rev-list-merge-order.sh
index
5dcb957
..
7fe744e
100755
(executable)
--- a/
t/t6001-rev-list-merge-order.sh
+++ b/
t/t6001-rev-list-merge-order.sh
@@
-8,6
+8,13
@@
test_description='Tests git-rev-list --merge-order functionality'
. ./test-lib.sh
. ../t6000lib.sh # t6xxx specific functions
. ./test-lib.sh
. ../t6000lib.sh # t6xxx specific functions
+if git-rev-list --merge-order 2>&1 | grep 'OpenSSL not linked' >/dev/null
+then
+ test_expect_success 'skipping merge-order test' :
+ test_done
+ exit
+fi
+
# test-case specific test function
check_adjacency()
{
# test-case specific test function
check_adjacency()
{