On Mon, Mar 31, 2014 at 3:15 PM, Junio C Hamano <gits...@pobox.com> wrote:
> As you are doing -3 (not the -p3), it would have:
>  * noticed that the patch is trying to update "baz/file";
>  * noticed that there is no "baz/file" but it could salvage the
>    patch by doing a three-way merge, in case that the patch was
>    prepared against a tree that moved path "foo/bar/baz" to "baz";
>    and
>  * such a three-way merge succeeds cleanly for a path whose movement
>    was detected correctly.
> So it does not look odd at all to me (the use of "-p 3" does look
> odd, but I know this is an effort to come up with a minimum example,
> so it is understandable that it may look contribed ;-).

Ah, we were thinking that 'git am' (when run from a subdirectory),
would apply the patches "from the current directory". So the right
solution was to instead do:

$  git am --directory=foo/bar/baz -p 3 0001-my-test.patch

Thank you,


Sverre Rabbelier
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to