From: Junio C Hamano Date: Thu, 17 Aug 2023 00:41:36 GMT Subject: Re: [PATCH v6 2/3] unit tests: add TAP unit test framework Message-ID: In-Reply-To: Junio C Hamano writes: > Josh Steadmon 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@gmail.com/ 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.