Merge branch 'mm/reset-facl-before-umask-test'

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index b8fc588b1922760ade8502fda3dc465f6ebf2887..e424de5363848233d2c1d9807df0a01411fd0d6d 100755 (executable)
--- a/t/t0001-init.sh
+++ b/t/t0001-init.sh
@@ -258,6 +258,9 @@ test_expect_success POSIXPERM 'init creates a new deep directory (umask vs. shar
        (
                # Leading directories should honor umask while
                # the repository itself should follow "shared"
+               mkdir newdir &&
+               # Remove a default ACL if possible.
+               (setfacl -k newdir 2>/dev/null || true) &&
                umask 002 &&
                git init --bare --shared=0660 newdir/a/b/c &&
                test_path_is_dir newdir/a/b/c/refs &&