projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f7e3bd3) | patch
do not overwrite files in leading path
authorClemens Buchacher <drizzd@aon.at>
Sat, 9 Oct 2010 13:53:00 +0000 (15:53 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 14 Dec 2010 16:55:12 +0000 (08:55 -0800)
commitb1735b1ab7743700064af528a998cdc952c8b9a1
tree6b2b26f56f394b0f2de5d1242476b65cc68c7d41tree | snapshot
parentf7e3bd37fb9355ee036da4cf11d6e8186b506d5fcommit | diff
do not overwrite files in leading path

If the work tree contains an untracked file x, and
unpack-trees wants to checkout a path x/*, the
file x is removed unconditionally.

Instead, apply the same checks that are normally
used for untracked files, and abort if the file
cannot be removed.

Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
cache.h diff | blob | history
symlinks.c diff | blob | history
t/t7607-merge-overwrite.sh diff | blob | history
unpack-trees.c diff | blob | history
Git—the stupid content tracker