X-Git-Url: https://git.verplant.org/?a=blobdiff_plain;f=t%2Ft6001-rev-list-merge-order.sh;h=010124238257f7bc0ae8eb75c5d71a79c7fdef7d;hb=655c7470e2ea7f25f22703b6654d7570e1567a39;hp=66bd9ca8df266d2efe7d3d8296042c87a04c26b5;hpb=28346d2d3c6e609a618c6c429d865e9d5d50b998;p=git.git

diff --git a/t/t6001-rev-list-merge-order.sh b/t/t6001-rev-list-merge-order.sh
index 66bd9ca8..01012423 100755
--- a/t/t6001-rev-list-merge-order.sh
+++ b/t/t6001-rev-list-merge-order.sh
@@ -6,7 +6,14 @@
 test_description='Tests git-rev-list --merge-order functionality'
 
 . ./test-lib.sh
-. ../t6000-lib.sh # t6xxx specific functions
+. ../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