| commit | 2fe26b775cfa298a0b4bc3c53011ca6da7c6c298 | |
| author | Johannes Sixt <j6t@kdbg.org> | |
| Sat, 5 Feb 2011 18:18:44 +0000 (5 19:18 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 15 Feb 2011 18:40:43 +0000 (15 10:40 -0800) | ||
| tree | 42e20e5e0e80d26bc0e647f95c692cd2cfa773d2 | treesnapshot (tar.gz zip) |
| parent | 7ed863a85a6ce2c4ac4476848310b8f917ab41f9 | commitdiff |
Demonstrate breakage: checkout overwrites untracked symlink with directory
This adds tests where an untracked file and an untracked symlink are in the
way where a directory should be created by 'git checkout'. Commit b1735b1a
(do not overwrite files in leading path, 2010-12-14) fixed the case where
a file is in the way, but the untracked symlink is still removed silently.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This adds tests where an untracked file and an untracked symlink are in the
way where a directory should be created by 'git checkout'. Commit b1735b1a
(do not overwrite files in leading path, 2010-12-14) fixed the case where
a file is in the way, but the untracked symlink is still removed silently.
Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t2021-checkout-overwrite.sh | [new file with mode: 0755] | blob |