From: Taylor Blau <me@ttaylorr.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Jeff King <peff@peff.net>, Taylor Blau <me@ttaylorr.com>,
git@vger.kernel.org
Subject: Re: What's cooking in git.git (Aug 2020, #07; Thu, 27)
Date: Thu, 27 Aug 2020 20:39:40 -0400 [thread overview]
Message-ID: <20200828003940.GA80266@syl.lan> (raw)
In-Reply-To: <xmqqzh6foe44.fsf@gitster.c.googlers.com>
On Thu, Aug 27, 2020 at 04:36:43PM -0700, Junio C Hamano wrote:
> Jeff King <peff@peff.net> writes:
>
> > On Thu, Aug 27, 2020 at 02:43:02PM -0700, Junio C Hamano wrote:
> >
> >> * tb/repack-clearing-midx (2020-08-26) 1 commit
> >> (merged to 'next' on 2020-08-27 at a465875cbb)
> >> + builtin/repack.c: invalidate MIDX only when necessary
> >>
> >> When a packfile is removed by "git repack", multi-pack-index gets
> >> cleared; the code was taught to do so less aggressively by first
> >> checking if the midx actually refers to a pack that no longer
> >> exists.
> >>
> >> Will merge to 'master'.
> >
> > This seems to break t7700 when run with midx support:
> >
> > $ git checkout e08f7bb093
> > HEAD is now at e08f7bb093 builtin/repack.c: invalidate MIDX only when necessary
> >
> > $ make && (cd t && GIT_TEST_MULTI_PACK_INDEX=1 ./t7700-repack.sh -i)
> > [...]
> > + git repack -a -d
> > Enumerating objects: 10, done.
> > Counting objects: 100% (10/10), done.
> > Delta compression using up to 16 threads
> > Compressing objects: 100% (5/5), done.
> > Writing objects: 100% (10/10), done.
> > Total 10 (delta 1), reused 10 (delta 1), pack-reused 0
> > fatal: error preparing packfile from multi-pack-index
> > error: last command exited with $?=128
> > not ok 6 - packed obs in alt ODB are repacked when local repo has packs
> > #
> > # rm -f .git/objects/pack/* &&
> > # echo new_content >>file1 &&
> > # git add file1 &&
> > # test_tick &&
> > # git commit -m more_content &&
> > # git repack &&
> > # git repack -a -d &&
> > # test_no_missing_in_packs
> >
> > I didn't look into whether it's a bug in the actual code, or just a
> > weird interaction with the way GIT_TEST_MULTI_PACK_INDEX triggers
> > git-repack to write a midx. But either way we should figure that out
> > before it graduates.
>
> Thanks for stopping us ;-)
Thanks indeed. I started looking into this tonight thinking that it'd be
an easy fix, but I think there is a deeper bug that is worth
investigating further.
Let's eject this for now. If the bug turns out to be easier than I
thought, I'll send the patch again, otherwise I'll send it with my
larger series when that's ready.
Thanks,
Taylor
next prev parent reply other threads:[~2020-08-28 0:40 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 [this message]
2020-08-28 6:26 ` Jeff King
2020-08-28 8:31 ` Jeff King
2020-08-28 18:09 ` Taylor Blau
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=20200828003940.GA80266@syl.lan \
--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.
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).