diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-25 15:40:18 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-25 15:40:18 -0800 |
| commit | 75b49bb181555b25d316bbe427ba7feedd2a58da (patch) | |
| tree | 689c880151a20ee5cd6e2db36cca4f2d11a54673 /builtin/merge-file.c | |
| parent | Merge branch 'sb/hex-object-name-is-at-most-41-bytes-long' (diff) | |
| parent | test-lib.sh: set prerequisite SANITY by testing what we really need (diff) | |
| download | tgif-75b49bb181555b25d316bbe427ba7feedd2a58da.tar.xz | |
Merge branch 'jk/sanity'
The tests that wanted to see that file becomes unreadable after
running "chmod a-r file", and the tests that wanted to make sure it
is not run as root, we used "can we write into the / directory?" as
a cheap substitute, but on some platforms that is not a good
heuristics. The tests and their prerequisites have been updated to
check what they really require.
* jk/sanity:
test-lib.sh: set prerequisite SANITY by testing what we really need
tests: correct misuses of POSIXPERM
t/lib-httpd: switch SANITY check for NOT_ROOT
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions