summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Johannes Sixt <j6t@kdbg.org>2013-06-07 22:53:34 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-06-07 15:01:53 -0700
commit70836a6f8b71a945f074fc796c4241c2183b83a2 (patch)
tree48b8d3ab56aaf9b741dcd39e098dbc18023664a8 /merge-blobs.h
parentt6035: use test_ln_s_add to remove SYMLINKS prerequisite (diff)
downloadtgif-70836a6f8b71a945f074fc796c4241c2183b83a2.tar.xz
t4011: remove SYMLINKS prerequisite
The part of the test that is about symbolic links in the index does not require that the corresponding file system entry is actually a symbolic link. Use test_ln_s_add to insert a symbolic link in the index. When the file system does not support symbolic links, we actually have a regular file in the worktree, which we can update as if it were a symbolic link. diff-index picks up the symbolic link property from the index. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions