From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>
Subject: Re: [PATCH] t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1`
Date: Tue, 2 Apr 2024 14:45:28 -0400 [thread overview]
Message-ID: <ZgxSSKGdAicfVhGA@nand.local> (raw)
In-Reply-To: <xmqqr0fn4nmx.fsf@gitster.g>
On Tue, Apr 02, 2024 at 11:37:10AM -0700, Junio C Hamano wrote:
> Taylor Blau <me@ttaylorr.com> writes:
>
> > There are a handful of related test breakages which are found when
> > running t/t7700-repack.sh with GIT_TEST_MULTI_PACK_INDEX set to "1" in
> > your environment.
> >
> > Both test failures are the result of something like:
> >
> > git repack --write-midx --write-bitmap-index [...] &&
> >
> > test_path_is_file $midx &&
> > test_path_is_file $midx-$(midx_checksum $objdir).bitmap
> >
> > , where we repack instructing Git to write a new MIDX and corresponding
> > MIDX bitamp.
> >
> > The error occurs when GIT_TEST_MULTI_PACK_INDEX=1 is found in the
> > enviornment. This causes Git to write out a second MIDX (after
> > processing the builtin's `--write-midx` argument) which is identical to
> > the first, but does not request a bitmap (since we did not set the
> > GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP variable in the environment).
>
> Doesn't it sound more like a bug, though? If a command line option
> requests something, should we still be honoring a contradicting
> instruction given by environment variable(s)?
>
> But anyway.
I have generally considered the `--write-midx` and
`GIT_TEST_MULTI_PACK_INDEX` options to be orthogonal to each other. The
latter is a developer-oriented option that forces Git to write a MIDX
post-repack regardless of the command-line option.
It predates the `--write-midx` option by a number of years, and IIUC was
introduced to enhance test coverage while the MIDX was being originally
developed.
I would argue that GIT_TEST_MULTI_PACK_INDEX should be on the list of
GIT_TEST_-variables to get rid of as it has served its purpose.
> > diff --git a/t/t7700-repack.sh b/t/t7700-repack.sh
> > index 94f9f4a1da..127efe99f8 100755
> > --- a/t/t7700-repack.sh
> > +++ b/t/t7700-repack.sh
> > @@ -629,6 +629,7 @@ test_expect_success '--write-midx with preferred bitmap tips' '
> > git log --format="create refs/tags/%s/%s %H" HEAD >refs &&
> > git update-ref --stdin <refs &&
> >
> > + GIT_TEST_MULTI_PACK_INDEX=0 \
> > git repack --write-midx --write-bitmap-index &&
> > test_path_is_file $midx &&
> > test_path_is_file $midx-$(midx_checksum $objdir).bitmap &&
>
> Is it a viable alternative approach to skip this check (and the
> other one) when GIT_TEST_MULTI_PACK_INDEX is set (i.e., lazy
> prereq). It will give us a better documentation value, e.g.,
>
> test_lazy_prereq FORCED_MIDX '
> # Features that are broken when GIT_TEST_* forces it
> # to enable are protexted with this prerequisite.
> test "$GIT_TEST_MULTI_PACK_INDEX" = 1;
> '
>
> test_expect_success !FORCED_MIDX '--write-midx with ...' '
> ...
> '
>
> With a single comment, we can annotate any future tests that relies
> on features working correctly even with GIT_TEST_MULTI_PACK_INDEX.
It's possible, but not something that I have seen done elsewhere for
this or any of the other GIT_TEST- variables.
Like I said, I'd like to get rid of this (and many other)
GIT_TEST-related variables, but that is a larger effort than this single
patch.
Thanks,
Taylor
next prev parent reply other threads:[~2024-04-02 18:45 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-02 16:26 [PATCH] t/t7700-repack.sh: fix test breakages with `GIT_TEST_MULTI_PACK_INDEX=1` Taylor Blau
2024-04-02 18:37 ` Junio C Hamano
2024-04-02 18:45 ` Taylor Blau [this message]
2024-04-02 19:55 ` Junio C Hamano
2024-04-02 20:04 ` Taylor Blau
2024-04-02 20:24 ` Jeff King
2024-04-02 22:10 ` Junio C Hamano
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=ZgxSSKGdAicfVhGA@nand.local \
--to=me@ttaylorr.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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).