Re: [PATCH v2 4/7] p5326: create missing 'perf-tag' tag

From: Jeff King <peff@peff.net>
Date: Sep 16, 2021, 22:36 UTC
Message-ID: <YUPHBv3d5p67NAnJ@coredump.intra.peff.net>
In-Reply-To: <a8c6e845adf559a96e37c973fea16da8a42e7cba.1631657157.git.me@ttaylorr.com>

On Tue, Sep 14, 2021 at 06:06:09PM -0400, Taylor Blau wrote:

> Some of the tests in test_full_bitmap rely on having a tag named
> perf-tag in place. We could create it in test_full_bitmap(), but we want
> to have it in place before the repack starts.

I wondered how p5326 ever could have worked without this.

But I think the answer is that it was added in a parallel-ish branch via 540cdc11ad (pack-bitmap: avoid traversal of objects referenced by uninteresting tag, 2021-03-22).

If that had then been merged with the midx-bitmap topic, we would have seen a conflict as yours tried to delete the surrounding tests that got moved into lib-bitmap.sh. But we didn't see such a merge. Your 9387fbd646 (p5310: extract full and partial bitmap tests, moves the perf-tag test, so p5326 was broken then (well, in the follow-on commit that introduced it).

Knowing the history of the midx-bitmap series, I'm almost certain what happened is that it got rebased, and you probably _did_ see a textual conflict, which you resolved correctly, moving the perf-tag test into lib-bitmap.sh But you missed the semantic conflict that p5326 also needed to add in the setup step.

All of which is to say this looks fine to me. ;) I was just talking out loud to try to understand what had happened.

-Peff