All of lore.kernel.org
 help / color / mirror / Atom feed
From: Greg KH <greg@kroah.com>
To: git@vger.kernel.org
Subject: git applymbox is too anal
Date: Thu, 8 Sep 2005 16:25:35 -0700	[thread overview]
Message-ID: <20050908232535.GA7700@kroah.com> (raw)

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.

for example:

$ git applymbox ~/linux/patches/u07

Applying 'USB: fix up URB_ASYNC_UNLINK usages from the usb-serial drivers'

error: patch failed: drivers/usb/serial/option.c:513
error: drivers/usb/serial/option.c: patch does not apply

$ patch -p1 --dry-run < ~/linux/patches/u07
patching file drivers/usb/serial/keyspan.c
patching file drivers/usb/serial/option.c
Hunk #3 succeeded at 509 with fuzz 1.


So, I have to then do a 'patch, git diff, git checkout-cache -f -u -a,
git applymbox' type dance to get this patch to apply.

Or am I missing some option to 'git applymbox' that I can't seem to
find?

thanks,

greg k-h

             reply	other threads:[~2005-09-08 23:27 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-08 23:25 Greg KH [this message]
2005-09-08 23:39 ` git applymbox is too anal Greg KH
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=20050908232535.GA7700@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.