unpack-trees: factor progress setup out of check_updates

This makes check_updates shorter and easier to understand.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/unpack-trees.c b/unpack-trees.c
index 9e48a4048d0f5c8004660546b7ea750abbddf695..b90c5407267c426ca733ce38d78d913269ea1afa 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -218,9 +218,27 @@ static void unlink_entry(const struct cache_entry *ce)
        schedule_dir_for_removal(ce->name, ce_namelen(ce));
 }
 
        schedule_dir_for_removal(ce->name, ce_namelen(ce));
 }
 

-static int check_updates(struct unpack_trees_options *o)
+static struct progress *get_progress(struct unpack_trees_options *o)

 {
        unsigned cnt = 0, total = 0;
 {
        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"),
+                                   total, 50, 1);
+}
+
+static int check_updates(struct unpack_trees_options *o)
+{
+       unsigned cnt = 0;

        int errs = 0;
        struct progress *progress = NULL;
        struct index_state *index = &o->result;
        int errs = 0;
        struct progress *progress = NULL;
        struct index_state *index = &o->result;


@@ -232,17 +250,7 @@ static int check_updates(struct unpack_trees_options *o)
        state.refresh_cache = 1;
        state.istate = index;
 
        state.refresh_cache = 1;
        state.istate = index;
 

-       if (o->update && o->verbose_update) {
-               for (total = cnt = 0; cnt < index->cache_nr; cnt++) {
-                       const struct cache_entry *ce = index->cache[cnt];
-                       if (ce->ce_flags & (CE_UPDATE | CE_WT_REMOVE))
-                               total++;
-               }
-
-               progress = start_progress_delay(_("Checking out files"),
-                                               total, 50, 1);
-               cnt = 0;
-       }
+       progress = get_progress(o);

 
        if (o->update)
                git_attr_set_direction(GIT_ATTR_CHECKOUT, index);
 
        if (o->update)
                git_attr_set_direction(GIT_ATTR_CHECKOUT, index);