[PATCH 4/5] unpack-trees: factor file removal out of check_updates

[Stefan Beller]

This makes check_updates shorter and easier to understand.

Signed-off-by: Stefan Beller <sbel...@google.com>
---
 unpack-trees.c | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index 971d091fd0..b954ec1233 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -237,30 +237,50 @@ static void display_error_msgs(struct 
unpack_trees_options *o)
 }
 
 /*
  * Unlink the last component and schedule the leading directories for
  * removal, such that empty directories get removed.
  */
 static void unlink_entry(const struct cache_entry *ce)
 {
        if (!check_leading_path(ce->name, ce_namelen(ce)))
                return;
        if (remove_or_warn(ce->ce_mode, ce->name))
                return;
        schedule_dir_for_removal(ce->name, ce_namelen(ce));
 }
 
+static int 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;
        struct index_state *index = &o->result;
 
        if (!o->update || !o->verbose_update)
                return NULL;
 
        for (; cnt < index->cache_nr; cnt++) {
                const struct cache_entry *ce = index->cache[cnt];
                if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
                        total++;
        }
 
        return start_progress_delay(_("Checking out files"),
@@ -273,39 +293,32 @@ static int check_updates(struct unpack_trees_options *o)
        int i, errs = 0;
 
        struct progress *progress = NULL;
        struct index_state *index = &o->result;
        struct checkout state = CHECKOUT_INIT;
 
        state.force = 1;
        state.quiet = 1;
        state.refresh_cache = 1;
        state.istate = index;
 
        progress = get_progress(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();
 
        for (i = 0; i < index->cache_nr; i++) {
                struct cache_entry *ce = index->cache[i];
 
                if (ce->ce_flags & CE_UPDATE) {
                        if (ce->ce_flags & CE_WT_REMOVE)
                                die("BUG: both update and delete flags are set 
on %s",
                                    ce->name);
                        display_progress(progress, ++cnt);
                        ce->ce_flags &= ~CE_UPDATE;
                        if (o->update && !o->dry_run) {
                                errs |= checkout_entry(ce, &state, NULL);
                        }
-- 
2.11.0.31.g919a8d0.dirty