Merge git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index ec0a10661409d24c77bf2061bd8a554bfb565d74..b324c491c52eb0fa39d713cc5f227d134c1adb01 100755 (executable)
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -96,7 +96,6 @@ test_expect_success 'fresh clone with svn.authors-file in config' '
                rm -r "$GIT_DIR" &&
                test x = x"$(git config svn.authorsfile)" &&
                test_config="$HOME"/.gitconfig &&
-               unset GIT_CONFIG_NOGLOBAL &&
                unset GIT_DIR &&
                unset GIT_CONFIG &&
                git config --global \