Merge branch 'ad/t4129-setfacl-target-fix' into maint

gitster · gitster · commit 40a2eeda421c · 2021-02-05T16:31:25.000-08:00
Test fix.

* ad/t4129-setfacl-target-fix:
  t4129: fix setfacl-related permissions failure
diff --git a/t/t4129-apply-samemode.sh b/t/t4129-apply-samemode.sh
@@ -78,7 +78,7 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree
 	test_config core.sharedRepository 0666 &&
 	(
 		# Remove a default ACL if possible.
-		(setfacl -k newdir 2>/dev/null || true) &&
+		(setfacl -k . 2>/dev/null || true) &&
 		umask 0077 &&
 
 		# Test both files (f1) and leading dirs (d)

Original file line number	Diff line number	Diff line change
`@@ -78,7 +78,7 @@ test_expect_success POSIXPERM 'do not use core.sharedRepository for working tree`
`78`	`78`	`test_config core.sharedRepository 0666 &&`
`79`	`79`	`(`
`80`	`80`	`# Remove a default ACL if possible.`
`81`		`- (setfacl -k newdir 2>/dev/null \|\| true) &&`
	`81`	`+ (setfacl -k . 2>/dev/null \|\| true) &&`
`82`	`82`	`umask 0077 &&`
`83`	`83`
`84`	`84`	`# Test both files (f1) and leading dirs (d)`