summaryrefslogtreecommitdiff
path: root/t/t6001-rev-list-merge-order.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/t6001-rev-list-merge-order.sh')
-rwxr-xr-xt/t6001-rev-list-merge-order.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 5dcb957..7fe744e 100755
--- 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
+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()
{