summaryrefslogtreecommitdiff
path: root/lockfile.c
diff options
context:
space:
mode:
authorLibravatar Clemens Buchacher <drizzd@aon.at>2010-10-09 15:53:00 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2010-12-14 08:55:12 -0800
commitb1735b1ab7743700064af528a998cdc952c8b9a1 (patch)
tree6b2b26f56f394b0f2de5d1242476b65cc68c7d41 /lockfile.c
parentlstat_cache: optionally return match_len (diff)
downloadtgif-b1735b1ab7743700064af528a998cdc952c8b9a1.tar.xz
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>
Diffstat (limited to 'lockfile.c')
0 files changed, 0 insertions, 0 deletions