diff options
| -rwxr-xr-x | t/t6001-rev-list-merge-order.sh | 7 |
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 5dcb957ac..7fe744e83 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() { |