Re: [PATCH v2 1/2] commit: Avoid redundant scissor line with --cleanup=scissors -v

From: Josh Triplett <josh@joshtriplett.org>
Date: Feb 29, 2024, 04:19 UTC
Message-ID: <ZeAFutaddf4M2wjM@localhost>
In-Reply-To: <xmqqjzmpu7k6.fsf@gitster.g>

On Tue, Feb 27, 2024 at 09:43:21AM -0800, Junio C Hamano wrote:

Show 12 quoted lines

> Josh Triplett <josh@joshtriplett.org> writes:
> 
> > diff --git a/wt-status.c b/wt-status.c
> > index ea13f5d8db..2d576f7a44 100644
> 
> I do not seem to have the preimage ea13f5d8db; as a bugfix patch, it
> would be preferrable to make the patches not to depend on anything
> in flight.  If feasible, it may even be nicer to base them on one of
> the maintenance tracks.
> 
> I managed to wiggle the patch in (somehow a context line was
> misindented), so there hopefully is no need to resend.

Sorry about that. I had these two patches in the same branch as my other recent patch `advice: Add advice.scissors to suppress "do not modify or remove this line"` but the two ended up independent so I didn't send them as a series. That patch and this two-patch series should be applicable independently.

If you do end up needing a resend of any of them, I'm happy to do so.