From: Junio C Hamano <gitster@pobox.com>
To: "SZEDER Gábor" <szeder.dev@gmail.com>
Cc: Taylor Blau <me@ttaylorr.com>,
dstolee@microsoft.com, peff@peff.net, git@vger.kernel.org
Subject: Re: [PATCH] commit-graph: fix progress of reachable commits
Date: Thu, 09 Jul 2020 10:27:50 -0700 [thread overview]
Message-ID: <xmqq5zawy4x5.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200709165432.2688-1-szeder.dev@gmail.com> ("SZEDER Gábor"'s message of "Thu, 9 Jul 2020 18:54:32 +0200")
SZEDER Gábor <szeder.dev@gmail.com> writes:
> To display a progress line while iterating over all refs,
> d335ce8f24 (commit-graph.c: show progress of finding reachable
> commits, 2020-05-13) should have added a pair of
> start_delayed_progress() and stop_progress() calls around a
> for_each_ref() invocation. Alas, the stop_progress() call ended up at
> the wrong place, after write_commit_graph(), which does all the
> commit-graph computation and writing, and has several progress lines
> of its own. Consequently, that new
>
> Collecting referenced commits: 123
>
> progress line is overwritten by the first progress line shown by
> write_commit_graph(), and its final "done" line is shown last, after
> everything is finished:
>
> Expanding reachable commits in commit graph: 344786, done.
> Computing commit changed paths Bloom filters: 100% (344786/344786), done.
> Collecting referenced commits: 154, done.
>
> Move that stop_progress() call to the right place.
>
> While at it, drop the unnecessary 'if (data.progress)' condition
> protecting the stop_progress() call, because that function is prepared
> to handle a NULL progress struct.
Nicely explained. Will apply. Thanks.
>
> Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
> ---
> commit-graph.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/commit-graph.c b/commit-graph.c
> index 5df3e08718..aaf3327ede 100644
> --- a/commit-graph.c
> +++ b/commit-graph.c
> @@ -1354,12 +1354,13 @@ int write_commit_graph_reachable(struct object_directory *odb,
> _("Collecting referenced commits"), 0);
>
> for_each_ref(add_ref_to_set, &data);
> +
> + stop_progress(&data.progress);
> +
> result = write_commit_graph(odb, NULL, &commits,
> flags, split_opts);
>
> oidset_clear(&commits);
> - if (data.progress)
> - stop_progress(&data.progress);
> return result;
> }
prev parent reply other threads:[~2020-07-09 17:27 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-09 16:54 [PATCH] commit-graph: fix progress of reachable commits SZEDER Gábor
2020-07-09 17:27 ` Junio C Hamano [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq5zawy4x5.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=me@ttaylorr.com \
--cc=peff@peff.net \
--cc=szeder.dev@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).