Merge branch 'da/difftool-mergetool-simplify-reporting-status'

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index e62c0ffbc22cffffd9c29254a96222bfb5b85633..7de8d85ee85e2387463e8d98175c9d8f66ca8959 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -12,6 +12,13 @@ check_config () {
                echo "expected a directory $1, a file $1/config and $1/refs"
                return 1
        fi
+
+       if test_have_prereq POSIXPERM && test -x "$1/config"
+       then
+               echo "$1/config is executable?"
+               return 1
+       fi
+
        bare=$(cd "$1" && git config --bool core.bare)
        worktree=$(cd "$1" && git config core.worktree) ||
        worktree=unset