summaryrefslogtreecommitdiff
path: root/contrib/examples/git-merge-ours.sh
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2012-06-06 09:28:24 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-06-07 10:09:02 -0700
commita14ad109115b29483b6e37d18159d850e2752c72 (patch)
treeca7cf196a245918659d372aa5065fc7bfd9c22e2 /contrib/examples/git-merge-ours.sh
parentt1304: fall back to $USER if $LOGNAME is not defined (diff)
downloadtgif-a14ad109115b29483b6e37d18159d850e2752c72.tar.xz
t1304: improve setfacl prerequisite setup
t1304 first runs setfacl as an experiment to see whether the filesystem supports ACLs, and skips the remaining tests if it does not. However, our setfacl run did not exercise the ACLs very well, and some filesystems may support our initial setfacl, but not the rest of the test. In particular, some versions of ecryptfs will erroneously apply the umask on top of an inherited directory ACL, causing our tests to fail. Let's be more careful and make sure both that we can read back the user ACL we set, and that the inherited ACL is propagated correctly. The latter catches the ecryptfs bug, but may also catch other bugs (e.g., an implementation which does not handle inherited ACLs at all). Since we're making the setup more complex, let's move it into its own test. This will hide the output for us unless the user wants to run "-v" to see it (and we don't need to bother printing anything about setfacl failing; the remaining tests will properly print "skip" due to the missing prerequisite). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/examples/git-merge-ours.sh')
0 files changed, 0 insertions, 0 deletions