From: Derrick Stolee <stolee@gmail.com>
To: Jeff King <peff@peff.net>, git@vger.kernel.org
Subject: Re: [PATCH] pack-objects: update "nr_seen" progress based on pack-reused count
Date: Mon, 12 Apr 2021 20:48:24 -0400 [thread overview]
Message-ID: <06e42cf3-188c-d314-b3b9-bdb2f43a37e6@gmail.com> (raw)
In-Reply-To: <YHPBXu9R/7i1jZhy@coredump.intra.peff.net>
On 4/11/2021 11:41 PM, Jeff King wrote:> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c
> index 525c2d8552..faee5a5c76 100644
> --- a/builtin/pack-objects.c
> +++ b/builtin/pack-objects.c
> @@ -3527,7 +3527,8 @@ static int get_object_list_from_bitmap(struct rev_info *revs)
> &reuse_packfile_bitmap)) {
> assert(reuse_packfile_objects);
> nr_result += reuse_packfile_objects;
> - display_progress(progress_state, nr_result);
> + nr_seen += reuse_packfile_objects;
> + display_progress(progress_state, nr_seen);
nr_seen and nr_result are defined in the same line with nr_written,
as static globals. I can understand how this mistake happened.
There are no other places where nr_result is used for
display_progress() while nr_seen _is_ used a couple more times.
> +test_expect_success 'enumerating progress counts pack-reused objects' '
> + count=$(git rev-list --objects --all --count) &&
> + git repack -adb &&
> +
> + # check first with only reused objects; confirm that our progress
> + # showed the right number, and also that we did pack-reuse as expected.
> + # Check only the final "done" line of the meter (there may be an
> + # arbitrary number of intermediate lines ending with CR).
> + GIT_PROGRESS_DELAY=0 \
> + git pack-objects --all --stdout --progress \
> + </dev/null >/dev/null 2>stderr &&
> + grep "Enumerating objects: $count, done" stderr &&
> + grep "pack-reused $count" stderr &&
> +
> + # now the same but with one non-reused object
> + git commit --allow-empty -m "an extra commit object" &&
> + GIT_PROGRESS_DELAY=0 \
> + git pack-objects --all --stdout --progress \
> + </dev/null >/dev/null 2>stderr &&
> + grep "Enumerating objects: $((count+1)), done" stderr &&
> + grep "pack-reused $count" stderr
> +'
Good test. LGTM.
Thanks,
-Stolee
next prev parent reply other threads:[~2021-04-13 0:48 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-12 3:41 [PATCH] pack-objects: update "nr_seen" progress based on pack-reused count Jeff King
2021-04-13 0:48 ` Derrick Stolee [this message]
2021-04-13 7:39 ` Jeff King
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=06e42cf3-188c-d314-b3b9-bdb2f43a37e6@gmail.com \
--to=stolee@gmail.com \
--cc=git@vger.kernel.org \
--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.
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).