Merge branch 'maint' of git://repo.or.cz/git-gui into maint

diff --git a/t/t1302-repo-version.sh b/t/t1302-repo-version.sh
index 9be0770e7627ee094349af85b0d4702e156ff6cd..8d305b43725f8cf60e7ee802df1923feb98eeae5 100755 (executable)
--- a/t/t1302-repo-version.sh
+++ b/t/t1302-repo-version.sh
@@ -41,7 +41,7 @@ test_expect_success 'gitdir required mode on normal repos' '
        cd test && git apply --check --index ../test.patch)'
 
 test_expect_success 'gitdir required mode on unsupported repo' '
-       (cd test2 && ! git apply --check --index ../test.patch)
+       (cd test2 && test_must_fail git apply --check --index ../test.patch)
 '
 
 test_done