Merge branch 'bs/maint-t7005'

diff --git a/t/t9111-git-svn-use-svnsync-props.sh b/t/t9111-git-svn-use-svnsync-props.sh
index e52321471a3f49098e61c5a2f9257d354a628d3b..ec7dedd48b0e45278b33e3c5d4f97d8df5f85ddf 100755 (executable)
--- a/t/t9111-git-svn-use-svnsync-props.sh
+++ b/t/t9111-git-svn-use-svnsync-props.sh
@@ -12,7 +12,7 @@ test_expect_success 'load svnsync repo' "
        git-svn init --minimize-url -R arr -i bar $svnrepo/bar &&
        git-svn init --minimize-url -R argh -i dir $svnrepo/dir &&
        git-svn init --minimize-url -R argh -i e $svnrepo/dir/a/b/c/d/e &&
-       git-config svn.useSvnsyncProps true &&
+       git config svn.useSvnsyncProps true &&
        git-svn fetch --all
        "
 
@@ -20,31 +20,31 @@ uuid=161ce429-a9dd-4828-af4a-52023f968c89
 
 bar_url=http://mayonaise/svnrepo/bar
 test_expect_success 'verify metadata for /bar' "
-       git-cat-file commit refs/remotes/bar | \
+       git cat-file commit refs/remotes/bar | \
           grep '^git-svn-id: $bar_url@12 $uuid$' &&
-       git-cat-file commit refs/remotes/bar~1 | \
+       git cat-file commit refs/remotes/bar~1 | \
           grep '^git-svn-id: $bar_url@11 $uuid$' &&
-       git-cat-file commit refs/remotes/bar~2 | \
+       git cat-file commit refs/remotes/bar~2 | \
           grep '^git-svn-id: $bar_url@10 $uuid$' &&
-       git-cat-file commit refs/remotes/bar~3 | \
+       git cat-file commit refs/remotes/bar~3 | \
           grep '^git-svn-id: $bar_url@9 $uuid$' &&
-       git-cat-file commit refs/remotes/bar~4 | \
+       git cat-file commit refs/remotes/bar~4 | \
           grep '^git-svn-id: $bar_url@6 $uuid$' &&
-       git-cat-file commit refs/remotes/bar~5 | \
+       git cat-file commit refs/remotes/bar~5 | \
           grep '^git-svn-id: $bar_url@1 $uuid$'
        "
 
 e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e
 test_expect_success 'verify metadata for /dir/a/b/c/d/e' "
-       git-cat-file commit refs/remotes/e | \
+       git cat-file commit refs/remotes/e | \
           grep '^git-svn-id: $e_url@1 $uuid$'
        "
 
 dir_url=http://mayonaise/svnrepo/dir
 test_expect_success 'verify metadata for /dir' "
-       git-cat-file commit refs/remotes/dir | \
+       git cat-file commit refs/remotes/dir | \
           grep '^git-svn-id: $dir_url@2 $uuid$' &&
-       git-cat-file commit refs/remotes/dir~1 | \
+       git cat-file commit refs/remotes/dir~1 | \
           grep '^git-svn-id: $dir_url@1 $uuid$'
        "