diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:08:22 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-09-10 17:08:22 +0900 |
| commit | 7fbbd3ec0f62b9147e867dee1916cd38d28e7b19 (patch) | |
| tree | a740428fb6795435dde7feb4e7b3c786192bb796 /unpack-trees.c | |
| parent | 8e36002adda45a35c6fc4daf81913c3d2102cb59 (diff) | |
| parent | 52f1d62eb44faf569edca360ec9af9ddd4045fe0 (diff) | |
| download | git-7fbbd3ec0f62b9147e867dee1916cd38d28e7b19.tar.gz | |
Merge branch 'ls/convert-filter-progress'
The codepath to call external process filter for smudge/clean
operation learned to show the progress meter.
* ls/convert-filter-progress:
convert: display progress for filtered objects that have been delayed
Diffstat (limited to 'unpack-trees.c')
| -rw-r--r-- | unpack-trees.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/unpack-trees.c b/unpack-trees.c index 87e8c69597..71b70ccb12 100644 --- 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; |