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

git-am applies half of a patch

From
JGJeff Garzik <jeff@garzik.org>
Date
Jan 9, 2007, 10:24 UTC
Message-ID
<45A36D6B.4010303@garzik.org>
I ran
	git-am --signoff --utf8 /g/tmp/mbox

on the attached file, to apply a patch to libata-dev.git#upstream, and it wound up only applying a portion of the patch:

Show 8 quoted lines
> [jgarzik@pretzel libata-dev]$ git-am --signoff --utf8 /g/tmp/mbox 
> 
> Applying 'Add pci class code for SATA AHCI'
> 
> error: patch fragment without header at line 35: @@ -862,7 +862,7 @@
> error: patch fragment without header at line 50: @@ -15,6 +15,8 @@
> Wrote tree 5d6f3a93bea932c950ac880deca173dd3e84dfcc
> Committed: 317b180bad43133027dc07455f1600f4e8a47d76
It seems quite bad to apply a patch that git-am KNOWS is incomplete.
	Jeff
Next: Junio C Hamano
Message 1 of 6 in “git-am applies half of a patch”
  1. Jeff GarzikJan 9, 2007
  2. Junio C HamanoJan 9, 2007
  3. Jeff GarzikJan 9, 2007
  4. Linus TorvaldsJan 9, 2007
  5. Junio C HamanoJan 9, 2007
  6. Linus TorvaldsJan 9, 2007

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.