git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Taylor Blau <me@ttaylorr.com>
Cc: git@vger.kernel.org
Subject: Re: tb/midx-bitmap-corruption-fix
Date: Tue, 04 Jan 2022 12:13:39 -0800	[thread overview]
Message-ID: <xmqq7dbfcl8s.fsf@gitster.g> (raw)
In-Reply-To: <YdSExm8fIiRePHI4@nand.local> (Taylor Blau's message of "Tue, 4 Jan 2022 12:32:54 -0500")

Taylor Blau <me@ttaylorr.com> writes:

> On Mon, Jan 03, 2022 at 07:46:46PM -0800, Junio C Hamano wrote:
>> * tb/midx-bitmap-corruption-fix (2021-12-23) 9 commits
>>  - midx: read `RIDX` chunk when present
>>  - t/lib-bitmap.sh: parameterize tests over reverse index source
>>  - t5326: move tests to t/lib-bitmap.sh
>>  - t5326: extract `test_rev_exists`
>>  - t5326: drop unnecessary setup
>>  - pack-revindex.c: instrument loading on-disk reverse index
>>  - midx.c: make changing the preferred pack safe
>>  - t5326: demonstrate bitmap corruption after permutation
>>  - Merge branch 'tb/cruft-packs' into tb/midx-bitmap-corruption-fix
>>  (this branch uses tb/cruft-packs.)
>>
>>  A bug that made multi-pack bitmap and the object order out-of-sync
>>  (hence the .midx data gets corrupted) has been fixed.
>>
>>  What's the status of this thing?
>>  source: <cover.1639446906.git.me@ttaylorr.com>
>
> I have a small reroll that I'll send shortly which contains a minor
> fixup and one new patch on top.
>
> I'm assuming that the "uses tb/cruft-packs" is related to the two topics
> both squatting on t5327's real estate?

It refers to the fact that the patches of this topic are queued on
top of a merge of that branch into (back-then-current) master, as
they didn't cleanly apply to (back-then-current) master.

> Otherwise, the version I am going to send is based off of dcc0cd074f
> (The sixth batch, 2022-01-03) in your tree, so it should apply cleanly
> onto master without the other topic.

OK.

  reply	other threads:[~2022-01-04 20:13 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-01-04  3:46 What's cooking in git.git (Jan 2022, #01; Mon, 3) Junio C Hamano
2022-01-04 12:23 ` jl/subtree-check-parents-argument-passing-fix, was " Johannes Schindelin
2022-01-04 20:05   ` Junio C Hamano
2022-01-04 13:59 ` lh/use-gnu-color-in-grep, " Johannes Schindelin
2022-01-04 18:06   ` Philippe Blain
2022-01-04 20:11     ` Junio C Hamano
2022-01-04 17:32 ` tb/midx-bitmap-corruption-fix (was: What's cooking in git.git (Jan 2022, #01; Mon, 3)) Taylor Blau
2022-01-04 20:13   ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-12-11  2:52 What's cooking in git.git (Dec 2021, #03; Fri, 10) Junio C Hamano
2021-12-11 22:09 ` tb/midx-bitmap-corruption-fix Taylor Blau
2021-12-15 18:47   ` tb/midx-bitmap-corruption-fix 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=xmqq7dbfcl8s.fsf@gitster.g \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=me@ttaylorr.com \
    /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).