Merge branch 'jk/report-fail-to-read-objects-better' into maint

diff --git a/t/t9117-git-svn-init-clone.sh b/t/t9117-git-svn-init-clone.sh
index 69e9c0db5d79c3c4c15db35970d61a91419c4fd7..a66f43c6b1a2d9194f87a17e1758f24018cf8b1b 100755 (executable)
--- a/t/t9117-git-svn-init-clone.sh
+++ b/t/t9117-git-svn-init-clone.sh
@@ -83,36 +83,36 @@ EOF
        rm -f expect actual
 }
 
-test_expect_success 'init with -s/-T/-b/-t without --prefix warns' '
+test_expect_success 'init with -s/-T/-b/-t assumes --prefix=origin/' '
        test ! -d project &&
        git svn init -s "$svnrepo"/project project 2>warning &&
-       grep -q prefix warning &&
-       test_svn_configured_prefix "" &&
+       test_must_fail grep -q prefix warning &&
+       test_svn_configured_prefix "origin/" &&
        rm -rf project &&
        rm -f warning
        '
 
-test_expect_success 'clone with -s/-T/-b/-t without --prefix warns' '
+test_expect_success 'clone with -s/-T/-b/-t assumes --prefix=origin/' '
        test ! -d project &&
        git svn clone -s "$svnrepo"/project 2>warning &&
-       grep -q prefix warning &&
-       test_svn_configured_prefix "" &&
+       test_must_fail grep -q prefix warning &&
+       test_svn_configured_prefix "origin/" &&
        rm -rf project &&
        rm -f warning
        '
 
-test_expect_success 'init with -s/-T/-b/-t and --prefix does not warn' '
+test_expect_success 'init with -s/-T/-b/-t and --prefix "" still works' '
        test ! -d project &&
-       git svn init -s "$svnrepo"/project project --prefix="" 2>warning &&
+       git svn init -s "$svnrepo"/project project --prefix "" 2>warning &&
        test_must_fail grep -q prefix warning &&
        test_svn_configured_prefix "" &&
        rm -rf project &&
        rm -f warning
        '
 
-test_expect_success 'clone with -s/-T/-b/-t and --prefix does not warn' '
+test_expect_success 'clone with -s/-T/-b/-t and --prefix "" still works' '
        test ! -d project &&
-       git svn clone -s "$svnrepo"/project --prefix="" 2>warning &&
+       git svn clone -s "$svnrepo"/project --prefix "" 2>warning &&
        test_must_fail grep -q prefix warning &&
        test_svn_configured_prefix "" &&
        rm -rf project &&