Re: [PATCH 0/5] Introduce 'uploadpack.lazyFetchTrusted'
Christian Couder <[email protected]>
| Newsgroups | org.kernel.vger.git |
|---|---|
| Message-ID | <CAP8UFD1LxM1s-MJuffhVks6JfBXoMzKii4YU4iQRNzXJZCQkfQ@mail.gmail.com> |
On Fri, Aug 7, 2026 at 8:31 PM Junio C Hamano <[email protected]> wrote: > > Documentation/config/uploadpack.adoc | 42 ++++++++++ > > Documentation/git-upload-pack.adoc | 5 ++ > > Documentation/git.adoc | 4 +- > > builtin/upload-pack.c | 11 +++ > > promisor-remote.c | 76 ++++++++++-------- > > setup.c | 108 ++++++++++++++------------ > > setup.h | 28 +++++++ > > t/t5710-promisor-remote-capability.sh | 70 +++++++++++++++++ > > upload-pack.c | 37 +++++++++ > > upload-pack.h | 3 + > > 10 files changed, 304 insertions(+), 80 deletions(-) > > What's missing is the information on the base. I tried applying > these patches to 'v2.55.0' and the recent tips of 'master': > > 2c78326f81 The 11th batch > 5b2471720c The 10th batch > a97fcc37c2 The 9th batch > 13c7afec21 The 8th batch > 9a0c4701dc The 7th batch > 5d2e770923 The 6th batch > 48bbf81c29 The 5th batch > 41365c2a9b The 4th batch for Git 2.56 > d35c5399e3 The 3rd batch for Git 2.56 > 55526a1826 The 2nd batch for Git 2.56 > > but the series did not apply to any of them. > > It turns out the reason has nothing to do with your choice of > base. It is because the series structure is not understood by 'b4'. > > The cover letter I am responding to is a reply to another series, > but the patches in this round are not marked as 'v2'. This seems > to cause 'b4' to grab patches from both series and smash them > together, resulting in an inapplicable mess. It seems you cannot > have your cake and eat it, too 😠. I guess b4 should have, or grow, an option for that, because it's not uncommon that someone would post an alternative patch or patch series in reply to some patch(es). > Next time, please do not thread the two topics together unless you > are marking the newer iteration with a higher 'vN' number. Ok, I will not do that. I will start a separate thread. Now I hope it will work if I send a v2 in reply to the latest series. Thanks.