[PATCH] t0001: don't let a default ACL interfere with the umask test

Matt McCutchen· Jan 28, 2017, 20:25 UTC · lore

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>
---
 t/t0001-init.sh | 3 +++
 1 file changed, 3 insertions(+)

Show changes to t/t0001-init.sh +3 −0

diff --git a/t/t0001-init.sh b/t/t0001-init.sh
index b8fc588..e424de5 100755
--- 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 &&

-- 
2.9.3

Junio C Hamano· Jan 31, 2017, 17:13 UTC · re: Matt McCutchen · lore

Re: [PATCH] t0001: don't let a default ACL interfere with the umask test

Matt McCutchen <matt@mattmccutchen.net> writes:

Show 6 quoted lines

> 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.)

Thanks--people with such a configuration who run tests are valuable ;-)

patcht0001: don't let a default ACL interfere with the umask test