Re: How to efficiently find where a patch applies?

[Jeff King <peff@peff.net>]

On Thu, May 05, 2011 at 03:12:05PM -0500, Nathan W. Panike wrote:

> The patches were emailed as raw diffs, not as format-patch messages, so I
> thought git-am was not applicable. Also, I was applying the patches to the git
> repository on behalf of local colleagues when they ran into problems using
> 'git-apply'.

Git-am is basically just a wrapper around git-apply that will split an
email message into a raw diff and a commit message. If you have raw
diffs in an email, it may handle them OK, or it may be simple enough to
massage them into the right form.

As far as I know, there isn't a convenient way to get "git apply" to do
the same merge magic for a raw diff that "git am -3" does. It should be
possible, as the only relevant input is the raw diff; I just don't think
anybody has bothered to do it.

> I did not want to deal with merge conflicts---my colleagues can
> handle the conflicts themselves. So a clean merge was optimal from my
> perspective.

Ah, that makes more sense. I have been in a similar "helping people with
git" situation myself.

> > Wow, dynamically generating awk using perl. That's a new one for me. :)
> You might say it is awk-ward.

Ouch. :)

-Peff