From: Greg KH <greg@kroah.com>
To: git@vger.kernel.org
Subject: Re: git applymbox is too anal
Date: Thu, 8 Sep 2005 16:39:06 -0700 [thread overview]
Message-ID: <20050908233906.GA7976@kroah.com> (raw)
In-Reply-To: <20050908232535.GA7700@kroah.com>
On Thu, Sep 08, 2005 at 04:25:35PM -0700, Greg KH wrote:
> Ick. I'm trying to apply a bunch of patches to a git repo (the kernel
> tree), using 'git applymbox' and it's just dieing on simple patches that
> apply with fuzz.
Ok, found another one. This time I looked at the patch itself, and it
is a bit "odd", but normal patch handles it fine.
The patch is:
--- gregkh-2.6.orig/drivers/usb/input/Makefile 2005-08-15 23:39:10.000000000 -0700
+++ gregkh-2.6/drivers/usb/input/Makefile 2005-08-16 12:31:54.000000000 -0700
@@ -39,5 +39,6 @@
obj-$(CONFIG_USB_POWERMATE) += powermate.o
obj-$(CONFIG_USB_WACOM) += wacom.o
obj-$(CONFIG_USB_ACECAD) += acecad.o
+obj-$(CONFIG_USB_YEALINK) += yealink.o
obj-$(CONFIG_USB_XPAD) += xpad.o
obj-$(CONFIG_USB_APPLETOUCH) += appletouch.o
While the original drivers/usb/input/Makefile in this area is:
obj-$(CONFIG_USB_POWERMATE) += powermate.o
obj-$(CONFIG_USB_WACOM) += wacom.o
obj-$(CONFIG_USB_ACECAD) += acecad.o
obj-$(CONFIG_USB_XPAD) += xpad.o
(ignore tab issues, this was cut-and-pasted).
So, the patch shows that there was another line at the end of the file,
while in reality it isn't (this is due to me excluding a patch from the
series that I'm applying due to other reasons.)
Is this something that git can handle without me editing the patch by
hand? :)
thanks,
greg k-h
next prev parent reply other threads:[~2005-09-08 23:39 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-08 23:25 git applymbox is too anal Greg KH
2005-09-08 23:39 ` Greg KH [this message]
2005-09-09 1:03 ` Junio C Hamano
2005-09-09 0:58 ` Linus Torvalds
2005-09-09 17:07 ` Greg KH
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=20050908233906.GA7976@kroah.com \
--to=greg@kroah.com \
--cc=git@vger.kernel.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;
as well as URLs for NNTP newsgroup(s).