X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=t%2Ft6001-rev-list-merge-order.sh;h=010124238257f7bc0ae8eb75c5d71a79c7fdef7d;hb=c6ae61590f79cb7ff848ef0f2c33396507e60442;hp=5dcb957ac0d058d1f97db0aefd88d432353900f9;hpb=776566000ffed2ffed5783f2227bb36859c85005;p=git.git

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 5dcb957a..01012423 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()
 {
@@ -38,7 +45,7 @@ grep_stderr()
 }
 
 date >path0
-git-update-cache --add path0
+git-update-index --add path0
 save_tag tree git-write-tree
 on_committer_date "1971-08-16 00:00:00" hide_error save_tag root unique_commit root tree
 on_committer_date "1971-08-16 00:00:01" save_tag l0 unique_commit l0 tree -p root