diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2010-10-09 15:53:00 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2010-10-13 14:34:09 -0700 |
| commit | f66caaf9c8e0feb840a439a58e165b963aec79cf (patch) | |
| tree | 0c0f99ba5a023b7330b949045ba188e3a7cc1fde /t/t6021-merge-criss-cross.sh | |
| parent | lstat_cache: optionally return match_len (diff) | |
| download | tgif-f66caaf9c8e0feb840a439a58e165b963aec79cf.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>
Diffstat (limited to 't/t6021-merge-criss-cross.sh')
0 files changed, 0 insertions, 0 deletions