aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2009-03-31 16:36:00 -0400
committerJunio C Hamano <gitster@pobox.com>2009-04-01 11:09:25 -0700
commit1b89eaa4bef44ef84f2af611d5db8727e3be266c (patch)
tree793400ce3e05ebae505b99c52c7c557eeecf3d33
parent17e61b82887fb71800b0fcd39ffe89ddf4d2492e (diff)
downloadgit-1b89eaa4bef44ef84f2af611d5db8727e3be266c.tar.gz
git-1b89eaa4bef44ef84f2af611d5db8727e3be266c.tar.xz
t1301: loosen test for forced modes
One of the aspects of the test checked explicitly for the g+s bit to be set on created directories. However, this is only the means to an end (the "end" being having the correct group set). And in fact, on systems where DIR_HAS_BSD_GROUP_SEMANTICS is set, we do not even need to use this "means" at all, causing the test to fail. This patch removes that part of the test. In an ideal world it would be replaced by a test to check that the group was properly assigned, but that is difficult to automate because it requires the user running the test suite be a member of multiple groups. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1301-shared-repo.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t1301-shared-repo.sh b/t/t1301-shared-repo.sh
index d459854e7..3c8a2373a 100755
--- a/t/t1301-shared-repo.sh
+++ b/t/t1301-shared-repo.sh
@@ -147,8 +147,8 @@ test_expect_success 'forced modes' '
# Everything must be unaccessible to others
test -z "$(sed -n -e "/^.......---/d" actual)" &&
- # All directories must have 2770
- test -z "$(sed -n -e "/^drwxrws---/d" -e "/^d/p" actual)" &&
+ # All directories must have either 2770 or 770
+ test -z "$(sed -n -e "/^drwxrw[sx]---/d" -e "/^d/p" actual)" &&
# post-update hook must be 0770
test -z "$(sed -n -e "/post-update/{