Merge branch 'maint'

diff --git a/t/t9100-git-svn-basic.sh b/t/t9100-git-svn-basic.sh
index 749b75e8d4fba546b22a0280b72891c38b5ea00a..4fea8d901bbc0f713a1500adbbdd2e5886720f47 100755 (executable)
--- a/t/t9100-git-svn-basic.sh
+++ b/t/t9100-git-svn-basic.sh
@@ -306,5 +306,13 @@ test_expect_success 'git-svn works in a bare repository' '
        git svn fetch ) &&
        rm -rf bare-repo
        '
+test_expect_success 'git-svn works in in a repository with a gitdir: link' '
+       mkdir worktree gitdir &&
+       ( cd worktree &&
+       git svn init "$svnrepo" &&
+       git init --separate-git-dir ../gitdir &&
+       git svn fetch ) &&
+       rm -rf worktree gitdir
+       '
 
 test_done