summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2009-03-31 16:36:00 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-04-01 11:09:25 -0700
commit1b89eaa4bef44ef84f2af611d5db8727e3be266c (patch)
tree793400ce3e05ebae505b99c52c7c557eeecf3d33 /xdiff/xmerge.c
parentset_shared_perm(): sometimes we know what the final mode bits should look like (diff)
downloadtgif-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>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions