![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Clemens Buchacher <drizzd@aon.at> | |
| Sat, 9 Oct 2010 13:53:00 +0000 (15:53 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Oct 2010 21:34:09 +0000 (14:34 -0700) | ||
| commit | f66caaf9c8e0feb840a439a58e165b963aec79cf | |
| tree | 0c0f99ba5a023b7330b949045ba188e3a7cc1fde | tree | snapshot |
| parent | 4856ff2a195e558c82ca3cab636c4d4fbef148e3 | commit | 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>
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>
| cache.h | diff | blob | history | |
| symlinks.c | diff | blob | history | |
| t/t7607-merge-overwrite.sh | diff | blob | history | |
| unpack-trees.c | diff | blob | history |