Skip to content
Snippets Groups Projects
Commit b1735b1a authored by Clemens Buchacher's avatar Clemens Buchacher Committed by Junio C Hamano
Browse files

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: default avatarClemens Buchacher <drizzd@aon.at>
Signed-off-by: default avatarJunio C Hamano <gitster@pobox.com>
parent f7e3bd37
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment