From: Jeff Garzik <jeff@garzik.org>
To: Git Mailing List <git@vger.kernel.org>
Cc: Linus Torvalds <torvalds@osdl.org>
Subject: git-am applies half of a patch
Date: Tue, 09 Jan 2007 05:24:43 -0500 [thread overview]
Message-ID: <45A36D6B.4010303@garzik.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 617 bytes --]
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:
> [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
[-- Attachment #2: mbox.bz2 --]
[-- Type: application/x-bzip, Size: 2426 bytes --]
next reply other threads:[~2007-01-09 10:25 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-09 10:24 Jeff Garzik [this message]
2007-01-09 10:52 ` git-am applies half of a patch Junio C Hamano
2007-01-09 11:10 ` Jeff Garzik
2007-01-09 16:08 ` Linus Torvalds
2007-01-09 18:12 ` Junio C Hamano
2007-01-09 16:02 ` Linus Torvalds
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=45A36D6B.4010303@garzik.org \
--to=jeff@garzik.org \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox