[PATCHv2 4/5] unpack-trees: factor file removal out of check_updates
From: Stefan Beller <hidden>
Date: 2017-01-09 19:47:12
Subsystem:
the rest · Maintainer:
Linus Torvalds
This makes check_updates shorter and easier to understand. Signed-off-by: Stefan Beller <redacted> --- unpack-trees.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-)
diff --git a/unpack-trees.c b/unpack-trees.c
index b564024472..ac59510251 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c@@ -218,6 +218,26 @@ static void unlink_entry(const struct cache_entry *ce) schedule_dir_for_removal(ce->name, ce_namelen(ce)); } +static unsigned remove_workingtree_files(struct unpack_trees_options *o, + struct progress *progress) +{ + int i; + unsigned cnt = 0; + struct index_state *index = &o->result; + + for (i = 0; i < index->cache_nr; i++) { + const struct cache_entry *ce = index->cache[i]; + + if (ce->ce_flags & CE_WT_REMOVE) { + display_progress(progress, ++cnt); + if (o->update && !o->dry_run) + unlink_entry(ce); + } + } + + return cnt; +} + static struct progress *get_progress(struct unpack_trees_options *o) { unsigned cnt = 0, total = 0;
@@ -254,15 +274,8 @@ static int check_updates(struct unpack_trees_options *o) if (o->update) git_attr_set_direction(GIT_ATTR_CHECKOUT, index); - for (i = 0; i < index->cache_nr; i++) { - const struct cache_entry *ce = index->cache[i]; - if (ce->ce_flags & CE_WT_REMOVE) { - display_progress(progress, ++cnt); - if (o->update && !o->dry_run) - unlink_entry(ce); - } - } + cnt = remove_workingtree_files(o, progress); remove_marked_cache_entries(index); remove_scheduled_dirs();
--
2.11.0.rc2.30.g7c4be45.dirty