git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Applying a patch with a diff header in its commit message

From
Pratyush Yadav <me@yadavpratyush.com>
Date
Jun 28, 2021, 18:30 UTC
Message-ID
<20210628183004.flxirucfv2celll3@yadavpratyush.com>
Hi,

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?

-- 
Regards,
Pratyush Yadav
Next: Felipe Contreras
Message 1 of 5 in “Applying a patch with a diff header in its commit message”
  1. Pratyush YadavJun 28, 2021
  2. Felipe ContrerasJun 28, 2021
  3. Pratyush YadavJul 6, 2021
  4. Ævar Arnfjörð BjarmasonJul 6, 2021
  5. Felipe ContrerasJul 6, 2021

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.