Merge branch 'mh/for-each-string-list-item-empty-fix'

diff --git a/unpack-trees.c b/unpack-trees.c
index 87e8c695971c470657fdd0b9fe29555e14604edd..71b70ccb12756cde1f1c5aeda952be6e2b91f5b8 100644 (file)
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -383,8 +383,8 @@ static int check_updates(struct unpack_trees_options *o)
                        }
                }
        }
-       errs |= finish_delayed_checkout(&state);
        stop_progress(&progress);
+       errs |= finish_delayed_checkout(&state);
        if (o->update)
                git_attr_set_direction(GIT_ATTR_CHECKIN, NULL);
        return errs != 0;