Merge branch 'maint'

diff --git a/t/t5403-post-checkout-hook.sh b/t/t5403-post-checkout-hook.sh
index 4fdb418550ee0f3c93e80f8c3df41094c0ada00c..5858b868ed6ff05d458996cf8c359a7148591582 100755 (executable)
--- a/t/t5403-post-checkout-hook.sh
+++ b/t/t5403-post-checkout-hook.sh
@@ -71,6 +71,7 @@ test_expect_success 'post-checkout receives the right args when not switching br
         test $old = $new -a $flag = 0
 '
 
+if test "$(git config --bool core.filemode)" = true; then
 mkdir -p templates/hooks
 cat >templates/hooks/post-checkout <<'EOF'
 #!/bin/sh
@@ -82,5 +83,6 @@ test_expect_success 'post-checkout hook is triggered by clone' '
        git clone --template=templates . clone3 &&
        test -f clone3/.git/post-checkout.args
 '
+fi
 
 test_done