On 2023.08.16 17:41, Junio C Hamano wrote: > Junio C Hamano <gitster@xxxxxxxxx> writes: > > > Josh Steadmon <steadmon@xxxxxxxxxx> writes: > > > >> diff --git a/Makefile b/Makefile > >> index e440728c24..4016da6e39 100644 > >> > >> --- a/Makefile > >> +++ b/Makefile > > > > With that blank line, I seem to be getting > > > > Applying: unit tests: add TAP unit test framework > > error: patch with only garbage at line 3 > > Patch failed at 0002 unit tests: add TAP unit test framework > > > > And with that blank line removed, I seem to then get > > > > Applying: unit tests: add TAP unit test framework > > error: patch failed: Makefile:682 > > error: Makefile: patch does not apply > > error: patch failed: t/Makefile:41 > > error: t/Makefile: patch does not apply > > > > This is on top of "The fifth batch", the commit your cover letter > > refers to as the base of the series, so I am puzzled... > > Well, I suspected that 2/3 comes from > https://lore.kernel.org/git/c902a166-98ce-afba-93f2-ea6027557176@xxxxxxxxx/ > which itself is whitespace damaged but has a reference to the > unit-tests branch of https://github.com/phillipwood/git repository. > > But it seems to be different in subtle ways. > > Please send a set of patches that can be applied cleanly (especially > when it is not an RFC series). > > Thanks. Sorry about the noise; I'm not sure how but the patch 2 commit message got a partial diff pasted in. I've fixed this in v7 which I'll send shortly.
