From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Tue, 06 Jul 2021 22:17:42 GMT
Subject: Re: Applying a patch with a diff header in its commit message
Message-ID: <60e4d686cb59d_1c428120810@natae.notmuch>
In-Reply-To: <20210706081738.5th24lypiicnbckv@yadavpratyush.com>

Pratyush Yadav wrote:
> On 28/06/21 06:44PM, Felipe Contreras wrote:
> > Pratyush Yadav wrote:
> > > I have a patch at $DAYJOB that contains a diff header ("diff --git 
> > > a/...") in its commit message, and unfortunately it is not indented. So 
> > > naturally, git-am trips up and thinks it is the start of the main diff 
> > > and tries to apply the diff starting there. It does not apply and the 
> > > patch is rejected as being corrupt.
> > > 
> > > I know one option for me is to manually edit the patch and indent the 
> > > diff header. But I would like to avoid that if possible. Is there any 
> > > way to apply that patch as-is? Is it possible to tell git-am where to 
> > > start looking for the diff?
> > 
> > git apply?
> 
> Sure, that is an option. But then I would have to copy/paste the commit 
> message and add the author information manually. Is there any way to do 
> this automatically? What if I have 100 commits like this?

Ahh, I misread your full question.

> This is a valid Git commit. It would be nice if the Git email tooling 
> could handle it cleanly.

Yes it would, that's definitely a bug.

-- 
Felipe Contreras