diff options
author | Johannes Sixt <j6t@kdbg.org> | 2013-06-07 22:53:30 +0200 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-06-07 15:01:49 -0700 |
commit | bba56042e7011a5555cb8b44a84e0d853fa43af5 (patch) | |
tree | 96279d67c40e9dc322a6a8b828efce1d0a627211 /upload-pack.c | |
parent | t0000: use test_ln_s_add to remove SYMLINKS prerequisite (diff) | |
download | tgif-bba56042e7011a5555cb8b44a84e0d853fa43af5.tar.xz |
t3030: use test_ln_s_add to remove SYMLINKS prerequisite
The test cases include many corner-cases of merge-recursive's behavior,
some of them involve type changes and symbolic links. All cases, including
those that are protected by SYMLINKS check only whether the result of
merge-recursive is correctly stored in the database and the index; the
file system is not investigated. Use test_ln_s_add to enter a symbolic
link in the index in the test setup and run the tests without the
SYMLINKS prerequisite.
Notice that one test that has the SYMLINKS protection removed is an
expect_failure. There is a possibility that the test fails differently
depending on whether SYMLINKS is present or not; but this is not the case
presently.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'upload-pack.c')
0 files changed, 0 insertions, 0 deletions