From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Mon, 28 Jun 2021 23:44:18 GMT
Subject: RE: Applying a patch with a diff header in its commit message
Message-ID: <60da5ed21ec8c_1f78f2082a@natae.notmuch>
In-Reply-To: <20210628183004.flxirucfv2celll3@yadavpratyush.com>

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?

-- 
Felipe Contreras