diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:01:50 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-25 19:01:50 -0700 |
| commit | 2c5942dbae01e5c23d2b68aced019702eb256ad9 (patch) | |
| tree | 38b103a22d51dc22835a06d375bab806c513acdb /unpack-trees.c | |
| parent | Merge branch 'jk/maint-add-empty' into maint (diff) | |
| parent | print unlink(2) errno in copy_or_link_directory (diff) | |
| download | tgif-2c5942dbae01e5c23d2b68aced019702eb256ad9.tar.xz | |
Merge branch 'ar/unlink-err' into maint
* ar/unlink-err:
print unlink(2) errno in copy_or_link_directory
replace direct calls to unlink(2) with unlink_or_warn
Introduce an unlink(2) wrapper which gives warning if unlink failed
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index e4eb8fa3af..aaacaf1015 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -61,7 +61,7 @@ static void unlink_entry(struct cache_entry *ce) { if (has_symlink_or_noent_leading_path(ce->name, ce_namelen(ce))) return; - if (unlink(ce->name)) + if (unlink_or_warn(ce->name)) return; schedule_dir_for_removal(ce->name, ce_namelen(ce)); } |