Sync with 2.10.1

diff --git a/t/t9153-git-svn-rewrite-uuid.sh b/t/t9153-git-svn-rewrite-uuid.sh
index 88a2cfa233e54e405956303ca67b807192b16465..372ef156850098928ac1ed402ab2228460af3c00 100755 (executable)
--- a/t/t9153-git-svn-rewrite-uuid.sh
+++ b/t/t9153-git-svn-rewrite-uuid.sh
@@ -17,9 +17,9 @@ test_expect_success 'load svn repo' "
 
 test_expect_success 'verify uuid' "
        git cat-file commit refs/remotes/git-svn~0 | \
-          grep '^${git_svn_id}: .*@2 $uuid$' &&
+          grep '^git-svn-id: .*@2 $uuid$' &&
        git cat-file commit refs/remotes/git-svn~1 | \
-          grep '^${git_svn_id}: .*@1 $uuid$'
+          grep '^git-svn-id: .*@1 $uuid$'
        "
 
 test_done