From: SZEDER Gábor Date: Sun, 31 Mar 2019 23:12:35 +0000 (+0200) Subject: index-pack: show progress while checking objects X-Git-Tag: v2.22.0-rc0~63^2 X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/79e3aa66244af40bd3c8999e00308f96748367d0?ds=inline;hp=--cc index-pack: show progress while checking objects When 'git index-pack' is run by 'git clone', its check_objects() function usually doesn't take long enough to be a concern, but I just run into a situation where it took about a minute or so: I inadvertently put some memory pressure on my tiny laptop while cloning linux.git, and then there was quite a long silence between the "Resolving deltas" and "Checking connectivity" progress bars. Show a progress bar during the loop of check_objects() to let the user know that something is still going on. Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano --- 79e3aa66244af40bd3c8999e00308f96748367d0 diff --git a/builtin/index-pack.c b/builtin/index-pack.c index 31046c7a0a..ccf4eb7e9b 100644 --- a/builtin/index-pack.c +++ b/builtin/index-pack.c @@ -219,8 +219,16 @@ static unsigned check_objects(void) unsigned i, max, foreign_nr = 0; max = get_max_object_index(); - for (i = 0; i < max; i++) + + if (verbose) + progress = start_delayed_progress(_("Checking objects"), max); + + for (i = 0; i < max; i++) { foreign_nr += check_object(get_indexed_object(i)); + display_progress(progress, i + 1); + } + + stop_progress(&progress); return foreign_nr; }