Code

do not overwrite untracked symlinks
authorClemens Buchacher <drizzd@aon.at>
Sun, 20 Feb 2011 12:13:43 +0000 (13:13 +0100)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Feb 2011 06:51:07 +0000 (22:51 -0800)
commit1d718a5108f905e3c64f9fa791e67a52bd926457
tree9871ac56854e4a1e983e390cd2c9f3a24beb0921
parent2fe26b775cfa298a0b4bc3c53011ca6da7c6c298
do not overwrite untracked symlinks

Git traditionally overwrites untracked symlinks silently. This will
generally not cause massive data loss, but it is inconsistent with
the behavior for regular files, which are not silently overwritten.

With this change, git refuses to overwrite untracked symlinks by
default. If the user really wants to overwrite the untracked
symlink, he has git-clean and git-checkout -f at his disposal.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
symlinks.c
t/t6035-merge-dir-to-symlink.sh