Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t9154-git-svn-fancy-glob.sh b/t/t9154-git-svn-fancy-glob.sh
index b780e0efe3de8939f12e408517510f3601de494d..a0150f057d00e67d66fcc877db067595fd350a82 100755 (executable)
--- a/t/t9154-git-svn-fancy-glob.sh
+++ b/t/t9154-git-svn-fancy-glob.sh
@@ -22,7 +22,7 @@ test_expect_success 'add red branch' "
        "
 
 test_expect_success 'add gre branch' "
-       GIT_CONFIG=.git/svn/.metadata git config --unset svn-remote.svn.branches-maxRev &&
+       git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
        git config svn-remote.svn.branches 'branches/{red,gre}:refs/remotes/*' &&
        git svn fetch &&
        git rev-parse refs/remotes/red &&
@@ -31,7 +31,7 @@ test_expect_success 'add gre branch' "
        "
 
 test_expect_success 'add green branch' "
-       GIT_CONFIG=.git/svn/.metadata git config --unset svn-remote.svn.branches-maxRev &&
+       git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
        git config svn-remote.svn.branches 'branches/{red,green}:refs/remotes/*' &&
        git svn fetch &&
        git rev-parse refs/remotes/red &&
@@ -40,7 +40,7 @@ test_expect_success 'add green branch' "
        "
 
 test_expect_success 'add all branches' "
-       GIT_CONFIG=.git/svn/.metadata git config --unset svn-remote.svn.branches-maxRev &&
+       git config --file=.git/svn/.metadata --unset svn-remote.svn.branches-maxRev &&
        git config svn-remote.svn.branches 'branches/*:refs/remotes/*' &&
        git svn fetch &&
        git rev-parse refs/remotes/red &&