commit | b1735b1ab7743700064af528a998cdc952c8b9a1 | [log] [tgz] |
---|---|---|
author | Clemens Buchacher <drizzd@aon.at> | Sat Oct 09 15:53:00 2010 +0200 |
committer | Junio C Hamano <gitster@pobox.com> | Tue Dec 14 08:55:12 2010 -0800 |
tree | 6b2b26f56f394b0f2de5d1242476b65cc68c7d41 | |
parent | f7e3bd37fb9355ee036da4cf11d6e8186b506d5f [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>