Merge branch 'dt/merge-recursive-case-insensitive' into maint

diff --git a/t/t9156-git-svn-fetch-deleted-tag-2.sh b/t/t9156-git-svn-fetch-deleted-tag-2.sh
index 5ce7e2f3b0e68c976c873fe11a2aec31897e6e6c..7a6e33ba3c50a2c1ed153664e18649043a96c048 100755 (executable)
--- a/t/t9156-git-svn-fetch-deleted-tag-2.sh
+++ b/t/t9156-git-svn-fetch-deleted-tag-2.sh
@@ -36,9 +36,9 @@ test_expect_success 'fetch deleted tags from same revision with no checksum erro
        cd git_project &&
        git svn fetch &&
 
-       git diff --exit-code master:subdir3/file tags/mytag:file &&
-       git diff --exit-code master:subdir2/file tags/mytag^:file &&
-       git diff --exit-code master:subdir1/file tags/mytag^^:file
+       git diff --exit-code master:subdir3/file origin/tags/mytag:file &&
+       git diff --exit-code master:subdir2/file origin/tags/mytag^:file &&
+       git diff --exit-code master:subdir1/file origin/tags/mytag^^:file
 '
 
 test_done