git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Taylor Blau <me@ttaylorr.com>
To: Jeff King <peff@peff.net>
Cc: Taylor Blau <me@ttaylorr.com>,
	Derrick Stolee <dstolee@microsoft.com>,
	Junio C Hamano <gitster@pobox.com>,
	git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2020, #07; Thu, 27)
Date: Fri, 28 Aug 2020 14:09:36 -0400	[thread overview]
Message-ID: <20200828180935.GB19328@nand.nand.local> (raw)
In-Reply-To: <20200828083125.GA2139751@coredump.intra.peff.net>

On Fri, Aug 28, 2020 at 04:31:25AM -0400, Jeff King wrote:
> On Fri, Aug 28, 2020 at 02:26:19AM -0400, Jeff King wrote:
>
> > On Thu, Aug 27, 2020 at 08:39:40PM -0400, Taylor Blau wrote:
> >
> > If I'm understanding midx_contains_pack() correctly, then the code
> > looking for ".pack" could never have matched, and we would never have
> > deleted a midx here. Which makes me wonder why the "repack removes
> > multi-pack-index when deleting packs" test ever succeeded.
>
> Sorry, this is all nonsense.
>
> I forgot about the hackery added in 013fd7ada3 (midx: check both pack
> and index names for containment, 2019-04-05). And anyway, the patch
> above is totally bogus because we need the ".pack" form in the buffer
> when we call unlink_pack_path().

Yeah, 013fd7ada3 is definitely a hack, but what you have is definitely
incorrect.

> So there's definitely something more odd going on in that failing test.

It's the funky order that we load the MIDX chain in (which is that the
MIDX belonging to the deepest alternate shows up *first* as
'r->objects->multi_pack_index', and that the local MIDX shows up as the
last thing when traversing '->next').

I sent what I consider to be a little bit of a hack in [1], but it's
definitely enough to fix t7700.6.

> -Peff

Thanks for reporting it.

Taylor

[1]: https://lore.kernel.org/git/20200828180621.GA9036@nand.nand.local/T/#u

  reply	other threads:[~2020-08-28 18:09 UTC|newest]

Thread overview: 17+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-08-27 21:43 What's cooking in git.git (Aug 2020, #07; Thu, 27) Junio C Hamano
2020-08-27 23:34 ` Jeff King
2020-08-27 23:36   ` Junio C Hamano
2020-08-28  0:39     ` Taylor Blau
2020-08-28  6:26       ` Jeff King
2020-08-28  8:31         ` Jeff King
2020-08-28 18:09           ` Taylor Blau [this message]
2020-08-28  2:16 ` Elijah Newren
2020-08-29  4:28   ` Matheus Tavares Bernardino
2020-08-28 15:48 ` ds/maintenance-part-[1-2] (was: What's cooking in git.git (Aug 2020, #07; Thu, 27)) Derrick Stolee
2020-08-28 20:09 ` What's cooking in git.git (Aug 2020, #07; Thu, 27) Hariom verma
2020-08-28 20:51   ` Junio C Hamano
2020-08-29 13:26     ` Hariom verma
2020-08-29 10:13 ` Hariom verma
2020-08-29 18:28   ` Junio C Hamano
2020-08-29 13:20     ` Hariom verma
2020-08-29 18:59       ` 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

  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=20200828180935.GB19328@nand.nand.local \
    --to=me@ttaylorr.com \
    --cc=dstolee@microsoft.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.
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).