Re: [RFC PATCH 0/8] Introduce Git Standard Library

From: Glen Choo <chooglen@google.com>
Date: Jun 28, 2023, 00:14 UTC
Message-ID: <kl6lzg4kqw7v.fsf@chooglen-macbookpro.roam.corp.google.com>
In-Reply-To: <20230627195251.1973421-1-calvinwan@google.com>

I see that this doesn't apply cleanly to 'master'. Do you have a base commit that reviewers can easily apply this to?

Calvin Wan <calvinwan@google.com> writes:

Show 7 quoted lines

> Before looking at this series, it probably makes sense to look at the
> other series that this is built on top of since that is the state I will
> be referring to in this cover letter:
>
>   - Elijah's final cache.h cleanup series[2]
>   - my strbuf cleanup series[3]
>   - my git-compat-util cleanup series[4]

Unfortunately, not all of these series apply cleanly to 'master' either, so I went digging for the topic branches, which I think are:

- en/header-split-cache-h-part-3
- cw/header-compat-util-shuffle
- cw/strbuf-cleanup

And then I tried merging them, but it looks like they don't merge cleanly either :/

(Btw Junio, I think cw/header-compat-util-shuffle didn't get called out in What's Cooking.)

> [2] https://lore.kernel.org/git/pull.1525.v3.git.1684218848.gitgitgadget@gmail.com/
> [3] https://lore.kernel.org/git/20230606194720.2053551-1-calvinwan@google.com/
> [4] https://lore.kernel.org/git/20230606170711.912972-1-calvinwan@google.com/