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

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