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

diff --git a/t/t9120-git-svn-clone-with-percent-escapes.sh b/t/t9120-git-svn-clone-with-percent-escapes.sh
index 1d92c05035f8fe68885a6338ceca4307f19e8663..1c84ce1023cedc5005009d3632784125180be075 100755 (executable)
--- a/t/t9120-git-svn-clone-with-percent-escapes.sh
+++ b/t/t9120-git-svn-clone-with-percent-escapes.sh
@@ -58,19 +58,19 @@ test_expect_success 'test clone --stdlayout with percent escapes' '
        git svn clone --stdlayout "$svnrepo/pr%20ject" percent &&
        (
                cd percent &&
-               git rev-parse refs/remotes/trunk^0 &&
-               git rev-parse refs/remotes/b^0 &&
-               git rev-parse refs/remotes/tags/v1^0
+               git rev-parse refs/remotes/origin/trunk^0 &&
+               git rev-parse refs/remotes/origin/b^0 &&
+               git rev-parse refs/remotes/origin/tags/v1^0
        )
 '
 
 test_expect_success 'test clone -s with unescaped space' '
-       git svn clone -s "$svnrepo/pr ject" space &&
+       git svn clone -s "$svnrepo/pr ject" --prefix origin/ space &&
        (
                cd space &&
-               git rev-parse refs/remotes/trunk^0 &&
-               git rev-parse refs/remotes/b^0 &&
-               git rev-parse refs/remotes/tags/v1^0
+               git rev-parse refs/remotes/origin/trunk^0 &&
+               git rev-parse refs/remotes/origin/b^0 &&
+               git rev-parse refs/remotes/origin/tags/v1^0
        )
 '