Merge branch 'rs/maint-diff-fd-leak' into maint

diff --git a/t/t9130-git-svn-authors-file.sh b/t/t9130-git-svn-authors-file.sh
index 134411e0a56142930a418ca15bd0902837c7bdc1..ec0a10661409d24c77bf2061bd8a554bfb565d74 100755 (executable)
--- a/t/t9130-git-svn-authors-file.sh
+++ b/t/t9130-git-svn-authors-file.sh
@@ -20,7 +20,7 @@ test_expect_success 'setup svnrepo' '
        '
 
 test_expect_success 'start import with incomplete authors file' '
-       ! git svn clone --authors-file=svn-authors "$svnrepo" x
+       test_must_fail git svn clone --authors-file=svn-authors "$svnrepo" x
        '
 
 test_expect_success 'imported 2 revisions successfully' '
@@ -63,7 +63,7 @@ test_expect_success 'authors-file against globs' '
        '
 
 test_expect_success 'fetch fails on ee' '
-       ( cd aa-work && ! git svn fetch --authors-file=../svn-authors )
+       ( cd aa-work && test_must_fail git svn fetch --authors-file=../svn-authors )
        '
 
 tmp_config_get () {
@@ -95,8 +95,6 @@ test_expect_success 'fresh clone with svn.authors-file in config' '
        (
                rm -r "$GIT_DIR" &&
                test x = x"$(git config svn.authorsfile)" &&
-               HOME="`pwd`" &&
-               export HOME &&
                test_config="$HOME"/.gitconfig &&
                unset GIT_CONFIG_NOGLOBAL &&
                unset GIT_DIR &&