All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Jonathan Tan <jonathantanmy@google.com>, git@vger.kernel.org
Subject: Re: [ANNOUNCE] Git v2.29.0-rc0
Date: Wed, 07 Oct 2020 10:38:40 -0700	[thread overview]
Message-ID: <xmqqlfgi2axr.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201007154533.GA186764@coredump.intra.peff.net> (Jeff King's message of "Wed, 7 Oct 2020 11:45:33 -0400")

Jeff King <peff@peff.net> writes:

> Hmm. That commit removes the call to display_progress() from the main
> loop of threaded_second_pass(), and doesn't appear to add another one
> anywhere. Is the solution really as simple as adding it back in? I.e.
>
> diff --git a/builtin/index-pack.c b/builtin/index-pack.c
> index 8acd078aa0..6dbb4317e0 100644
> --- a/builtin/index-pack.c
> +++ b/builtin/index-pack.c
> @@ -1028,6 +1028,10 @@ static void *threaded_second_pass(void *data)
>  		struct object_entry *child_obj;
>  		struct base_data *child;
>  
> +		counter_lock();
> +		display_progress(progress, nr_resolved_deltas);
> +		counter_unlock();
> +
>  		work_lock();
>  		if (list_empty(&work_head)) {
>  			/*
>
> That _seems_ to work fine, but I'm not sure why it was removed in the
> first place (for a good reason, or simply as an accident when rewriting
> the variable declarations at the top of the loop?).

The above looks like an obvious and trivial fix to go back closer to
the original.

We seem to have removed find_unresolved_deltas() helper function in
that series, but there remains a mention to it in a comment, which
we would probably should rethink (it just may be the matter of
removing the mention, or if "just like in ..." may have been the
last example of doing what the comment suggests all code to do, it
may reveal a need for larger clean-up---I dunno).

Thanks.




  reply	other threads:[~2020-10-07 17:38 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-10-05 22:41 [ANNOUNCE] Git v2.29.0-rc0 Junio C Hamano
2020-10-05 23:33 ` Bryan Turner
2020-10-05 23:42 ` Randall S. Becker
2020-10-06  3:57 ` Martin Ågren
2020-10-06  6:08   ` Junio C Hamano
2020-10-07  9:54 ` Ævar Arnfjörð Bjarmason
2020-10-07 15:39 ` Jeff King
2020-10-07 15:45   ` Jeff King
2020-10-07 17:38     ` Junio C Hamano [this message]
2020-10-07 18:17       ` [PATCH 0/3] jt/threaded-inex-pack leftovers Jeff King
2020-10-07 18:19         ` [PATCH 1/3] index-pack: restore "resolving deltas" progress meter Jeff King
2020-10-07 18:50           ` Junio C Hamano
2020-10-07 18:19         ` [PATCH 2/3] index-pack: drop type_cas mutex Jeff King
2020-10-07 20:09           ` Jonathan Tan
2020-10-07 18:19         ` [PATCH 3/3] index-pack: stop mentioning find_unresolved_deltas() Jeff King
2020-10-07 18:41       ` [ANNOUNCE] Git v2.29.0-rc0 Jonathan Tan
2020-10-07 18:48         ` Jeff King
2020-10-07 20:16           ` [PATCH] index-pack: make get_base_data() comment clearer Jonathan Tan
2020-10-07 20:46             ` Junio C Hamano
2020-10-07 22:28 ` [ANNOUNCE] Git v2.29.0-rc0 Philippe Blain
2020-10-09 19:51 ` Randall S. Becker

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqlfgi2axr.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jonathantanmy@google.com \
    --cc=peff@peff.net \
    /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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.