Merge branch 'maint-1.6.0' into maint

diff --git a/t/t9128-git-svn-cmd-branch.sh b/t/t9128-git-svn-cmd-branch.sh
index 47c4d4d938eea2ae193d8e4795a08d19a4900354..252daa7e1aec3c40a31db9a12a9432fbb85ef1b0 100755 (executable)
--- a/t/t9128-git-svn-cmd-branch.sh
+++ b/t/t9128-git-svn-cmd-branch.sh
@@ -56,4 +56,23 @@ test_expect_success 'git svn branch tests' '
        test_must_fail git svn tag tag1
 '
 
+test_expect_success 'branch uses correct svn-remote' '
+       (svn co "$svnrepo" svn &&
+       cd svn &&
+       mkdir mirror &&
+       svn add mirror &&
+       svn copy trunk mirror/ &&
+       svn copy tags mirror/ &&
+       svn copy branches mirror/ &&
+       svn ci -m "made mirror" ) &&
+       rm -rf svn &&
+       git svn init -s -R mirror --prefix=mirror/ "$svnrepo"/mirror &&
+       git svn fetch -R mirror &&
+       git checkout mirror/trunk &&
+       base=$(git rev-parse HEAD:) &&
+       git svn branch -m "branch in mirror" d &&
+       test $base = $(git rev-parse remotes/mirror/d:) &&
+       test_must_fail git rev-parse remotes/d
+'
+
 test_done