diff options
| author | Johannes Sixt <johannes.sixt@telecom.at> | 2007-07-02 13:28:42 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-02 20:58:16 -0700 |
| commit | 05dcd69891632101d347b2f8a6bc37a08878aa1a (patch) | |
| tree | 02013bbb65c35e008c6e5681226ef9a65baa173a /archive-zip.c | |
| parent | 098e711e6c0d123dff2f38d6b804ec632ad7dd78 (diff) | |
| download | git-05dcd69891632101d347b2f8a6bc37a08878aa1a.tar.gz git-05dcd69891632101d347b2f8a6bc37a08878aa1a.tar.xz | |
Test 'git add' for unmerged entries when core.symlinks=false.
In 20314271679e169f324c118c69c8d9e0399feec9 git add was fixed if unmerged
entries are in the index and core.filemode=false. core.symlinks=false is
a similar case, which touches the same code path. Here is a test that
makes sure that the symlink property in the index is preserved, too.
Signed-off-by: Johannes Sixt <johannes.sixt@telecom.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'archive-zip.c')
0 files changed, 0 insertions, 0 deletions