Merge branch 'master' of https://github.com/vnwildman/git

diff --git a/t/t9140-git-svn-reset.sh b/t/t9140-git-svn-reset.sh
index 0735526d4ba4f2b692e000bcd4116be91d650355..e8559046296ce5570ec46b2b3a9280f0a493bbc4 100755 (executable)
--- a/t/t9140-git-svn-reset.sh
+++ b/t/t9140-git-svn-reset.sh
@@ -41,7 +41,7 @@ test_expect_success 'modify hidden file in SVN repo' '
 test_expect_success 'fetch fails on modified hidden file' '
        ( cd g &&
          git svn find-rev refs/remotes/git-svn > ../expect &&
-         ! git svn fetch 2> ../errors &&
+         test_must_fail git svn fetch 2> ../errors &&
          git svn find-rev refs/remotes/git-svn > ../expect2 ) &&
        fgrep "not found in commit" errors &&
        test_cmp expect expect2