Merge branch 'nd/daemon-log-sock-errors'

diff --git a/t/t6019-rev-list-ancestry-path.sh b/t/t6019-rev-list-ancestry-path.sh
index 738af73393a073c42718ed61ca7be09d47bdc316..39b4cb0ecdc8801b355b815a0566c6e2df5c5a39 100755 (executable)
--- a/t/t6019-rev-list-ancestry-path.sh
+++ b/t/t6019-rev-list-ancestry-path.sh
@@ -75,33 +75,36 @@ test_expect_success 'rev-list --ancestry-patch D..M -- M.t' '
 # a   X
 #  \ / \
 #   c---cb
+#
+# All refnames prefixed with 'x' to avoid confusion with the tags
+# generated by test_commit on case-insensitive systems.
 test_expect_success 'setup criss-cross' '
        mkdir criss-cross &&
        (cd criss-cross &&
         git init &&
         test_commit A &&
-        git checkout -b b master &&
+        git checkout -b xb master &&
         test_commit B &&
-        git checkout -b c master &&
+        git checkout -b xc master &&
         test_commit C &&
-        git checkout -b bc b -- &&
-        git merge c &&
-        git checkout -b cb c -- &&
-        git merge b &&
+        git checkout -b xbc xb -- &&
+        git merge xc &&
+        git checkout -b xcb xc -- &&
+        git merge xb &&
         git checkout master)
 '
 
 # no commits in bc descend from cb
 test_expect_success 'criss-cross: rev-list --ancestry-path cb..bc' '
        (cd criss-cross &&
-        git rev-list --ancestry-path cb..bc > actual &&
+        git rev-list --ancestry-path xcb..xbc > actual &&
         test -z "$(cat actual)")
 '
 
 # no commits in repository descend from cb
 test_expect_success 'criss-cross: rev-list --ancestry-path --all ^cb' '
        (cd criss-cross &&
-        git rev-list --ancestry-path --all ^cb > actual &&
+        git rev-list --ancestry-path --all ^xcb > actual &&
         test -z "$(cat actual)")
 '