Merge branch 'sb/unpack-trees-cleanup'

Code cleanup.

* sb/unpack-trees-cleanup:
unpack-trees: factor progress setup out of check_updates
unpack-trees: remove unneeded continue
unpack-trees: move checkout state into check_updates

diff --combined unpack-trees.c
index 7a6df99d10e1dbabc9f7df74316fd91bd55c1fd5,b90c5407267c426ca733ce38d78d913269ea1afa..129d49ff4517ae0f6c843a9f53c1617f3c2cb3ca
--- 1/unpack-trees.c
--- 2/unpack-trees.c
+++ b/unpack-trees.c
@@@ -78,7 -78,7 +78,7 @@@ void setup_unpack_trees_porcelain(struc
                xstrfmt(msg, cmd, cmd);
  
        msgs[ERROR_NOT_UPTODATE_DIR] =
 -              _("Updating the following directories would lose untracked files in it:\n%s");
 +              _("Updating the following directories would lose untracked files in them:\n%s");
  
        if (!strcmp(cmd, "checkout"))
                msg = advice_commit_before_merge
@@@ -218,29 -218,42 +218,42 @@@ static void unlink_entry(const struct c
        schedule_dir_for_removal(ce->name, ce_namelen(ce));
  }
  
- static int check_updates(struct unpack_trees_options *o,
-                        const struct checkout *state)
+ 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"),
+                                   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;
+       struct checkout state = CHECKOUT_INIT;
        int i;
-       int errs = 0;
  
-       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++;
-               }
+       state.force = 1;
+       state.quiet = 1;
+       state.refresh_cache = 1;
+       state.istate = index;
  
-               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, &o->result);
+               git_attr_set_direction(GIT_ATTR_CHECKOUT, index);
        for (i = 0; i < index->cache_nr; i++) {
                const struct cache_entry *ce = index->cache[i];
  
@@@ -248,10 -261,9 +261,9 @@@
                        display_progress(progress, ++cnt);
                        if (o->update && !o->dry_run)
                                unlink_entry(ce);
-                       continue;
                }
        }
-       remove_marked_cache_entries(&o->result);
+       remove_marked_cache_entries(index);
        remove_scheduled_dirs();
  
        for (i = 0; i < index->cache_nr; i++) {
@@@ -264,7 -276,7 +276,7 @@@
                        display_progress(progress, ++cnt);
                        ce->ce_flags &= ~CE_UPDATE;
                        if (o->update && !o->dry_run) {
-                               errs |= checkout_entry(ce, state, NULL);
+                               errs |= checkout_entry(ce, &state, NULL);
                        }
                }
        }
@@@ -1094,14 -1106,9 +1106,9 @@@ int unpack_trees(unsigned len, struct t
        int i, ret;
        static struct cache_entry *dfc;
        struct exclude_list el;
-       struct checkout state = CHECKOUT_INIT;
  
        if (len > MAX_UNPACK_TREES)
                die("unpack_trees takes at most %d trees", MAX_UNPACK_TREES);
-       state.force = 1;
-       state.quiet = 1;
-       state.refresh_cache = 1;
-       state.istate = &o->result;
  
        memset(&el, 0, sizeof(el));
        if (!core_apply_sparse_checkout || !o->update)
@@@ -1238,7 -1245,7 +1245,7 @@@
        }
  
        o->src_index = NULL;
-       ret = check_updates(o, &state) ? (-2) : 0;
+       ret = check_updates(o) ? (-2) : 0;
        if (o->dst_index) {
                if (!ret) {
                        if (!o->result.cache_tree)