summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrandon Casey <drafnel@gmail.com>2010-03-15 17:14:33 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-03-17 02:05:54 (GMT)
commitdb826571e4099066fe44233d95642591016c831b (patch)
tree6028c42ea5b76110511dc7d26b96ad0384ec41b6
parentc24138bc55bcbbde2ea8601c504752e5a39f53f2 (diff)
downloadgit-db826571e4099066fe44233d95642591016c831b.zip
git-db826571e4099066fe44233d95642591016c831b.tar.gz
git-db826571e4099066fe44233d95642591016c831b.tar.bz2
t/t1304: avoid -d option to setfacl
Some platforms (Solaris) have a setfacl whose -d switch works differently than the one on Linux. On Linux, it causes all operations to be applied to the Default ACL. There is a notation for operating on the Default ACL: [d[efault]:] [u[ser]:]uid [:perms] so use it instead of the -d switch. Signed-off-by: Brandon Casey <casey@nrlssc.navy.mil> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1304-default-acl.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1304-default-acl.sh b/t/t1304-default-acl.sh
index cc30be4..415a2dd 100755
--- a/t/t1304-default-acl.sh
+++ b/t/t1304-default-acl.sh
@@ -46,8 +46,8 @@ dirs_to_set="./ .git/ .git/objects/ .git/objects/pack/"
test_expect_success 'Setup test repo' '
setfacl -m u:root:rwx $dirs_to_set &&
- setfacl -d -m u:"$LOGNAME":rwx $dirs_to_set &&
- setfacl -d -m u:root:rwx $dirs_to_set &&
+ setfacl -m d:u:"$LOGNAME":rwx $dirs_to_set &&
+ setfacl -m d:u:root:rwx $dirs_to_set &&
touch file.txt &&
git add file.txt &&