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 /cache.h | |
| parent | 4856ff2a195e558c82ca3cab636c4d4fbef148e3 (diff) | |
| download | git-f66caaf9c8e0feb840a439a58e165b963aec79cf.tar.gz git-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 'cache.h')
| -rw-r--r-- | cache.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -859,7 +859,7 @@ struct cache_def { extern int has_symlink_leading_path(const char *name, int len); extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int); -extern int has_symlink_or_noent_leading_path(const char *name, int len); +extern int check_leading_path(const char *name, int len); extern int has_dirs_only_path(const char *name, int len, int prefix_len); extern void schedule_dir_for_removal(const char *name, int len); extern void remove_scheduled_dirs(void); |