t0001: don't let a default ACL interfere with the umask test
authorMatt McCutchen <matt@mattmccutchen.net>
Sat, 28 Jan 2017 20:25:48 +0000 (15:25 -0500)
committerJunio C Hamano <gitster@pobox.com>
Mon, 30 Jan 2017 22:03:21 +0000 (14:03 -0800)
The "init creates a new deep directory (umask vs. shared)" test expects
the permissions of newly created files to be based on the umask, which
fails if a default ACL is inherited from the working tree for git. So
attempt to remove a default ACL if there is one. Same idea as
8ed0a740dd42bd0724aebed6e3b07c4ea2a2d5e8. (I guess I'm the only one who
ever runs the test suite with a default ACL set.)

Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t0001-init.sh
index a6fdd5ef3a66f06f5b4a787ca8ad8db2ab4da96f..7bfc69784db32687965baf4e86456d9ac1835504 100755 (executable)
@@ -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 &&