Merge branch 'jl/submodule-ignore-diff'

diff --git a/t/t9143-git-svn-gc.sh b/t/t9143-git-svn-gc.sh
index aaa3af014c7a8a8eb105374212f76cca8bf22012..337ea59711ac7aca78a27afb92693f88e98aed9d 100755 (executable)
--- a/t/t9143-git-svn-gc.sh
+++ b/t/t9143-git-svn-gc.sh
@@ -28,17 +28,26 @@ test_expect_success 'Setup repo' 'git svn init "$svnrepo"'
 test_expect_success 'Fetch repo' 'git svn fetch'
 
 test_expect_success 'make backup copy of unhandled.log' '
-        cp .git/svn/git-svn/unhandled.log tmp
+        cp .git/svn/refs/remotes/git-svn/unhandled.log tmp
        '
 
+test_expect_success 'create leftover index' '> .git/svn/refs/remotes/git-svn/index'
+
 test_expect_success 'git svn gc runs' 'git svn gc'
 
-test_expect_success 'git svn gc produces a valid gzip file' '
-        gunzip .git/svn/git-svn/unhandled.log.gz
-       '
+test_expect_success 'git svn index removed' '! test -f .git/svn/refs/remotes/git-svn/index'
+
+if perl -MCompress::Zlib -e 0 2>/dev/null
+then
+       test_expect_success 'git svn gc produces a valid gzip file' '
+                gunzip .git/svn/refs/remotes/git-svn/unhandled.log.gz
+               '
+else
+       say "# Perl Compress::Zlib unavailable, skipping gunzip test"
+fi
 
 test_expect_success 'git svn gc does not change unhandled.log files' '
-        test_cmp .git/svn/git-svn/unhandled.log tmp/unhandled.log
+        test_cmp .git/svn/refs/remotes/git-svn/unhandled.log tmp/unhandled.log
        '
 
 test_done