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

diff --git a/t/t3701-add-interactive.sh b/t/t3701-add-interactive.sh
index f15be93e7709acbb517bb85020d4d6b94a50f725..fae64eae9f9ff9b34b935e8556df61d2093425cf 100755 (executable)
--- a/t/t3701-add-interactive.sh
+++ b/t/t3701-add-interactive.sh
@@ -66,6 +66,11 @@ test_expect_success 'revert works (commit)' '
        grep "unchanged *+3/-0 file" output
 '
 
+if test "$(git config --bool core.filemode)" = false
+then
+    say 'skipping filemode tests (filesystem does not properly support modes)'
+else
+
 test_expect_success 'patch does not affect mode' '
        git reset --hard &&
        echo content >>file &&
@@ -84,5 +89,7 @@ test_expect_success 'stage mode but not hunk' '
        git diff          file | grep "+content"
 '
 
+fi
+# end of tests disabled when filemode is not usable
 
 test_done