| commit | 05dcd69891632101d347b2f8a6bc37a08878aa1a | |
| author | Johannes Sixt <johannes.sixt@telecom.at> | |
| Mon, 2 Jul 2007 11:28:42 +0000 (2 13:28 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 3 Jul 2007 03:58:16 +0000 (2 20:58 -0700) | ||
| tree | 02013bbb65c35e008c6e5681226ef9a65baa173a | treesnapshot (tar.gz zip) |
| parent | 098e711e6c0d123dff2f38d6b804ec632ad7dd78 | commitdiff |
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>
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>
| t/t3700-add.sh | diffblobblamehistory |