Re: [PATCH v5 00/44] Make git-am a builtin

[Paul Tan <pyokagan@gmail.com>]

On Wed, Jul 8, 2015 at 3:31 PM, Junio C Hamano <gitster@pobox.com> wrote:
> Paul Tan <pyokagan@gmail.com> writes:
>
>> This patch series rewrites git-am.sh into optimized C builtin/am.c, and is
>> part of my GSoC project to rewrite git-pull and git-am into C builtins[1].
>
> I merged this to 'jch' (that is somewhere in between 'next' and
> 'pu', which is what I use for everyday work) and tried it to apply
> the 8-patch series that starts at $gmane/273622 on top of 912bd49.
>
> It appears that your builtin version makes "am -3s" barf at the
> [PATCH 7/8] in that series, complaining about lack of author
> identity.

Hmm? I compiled jch, and tried to reproduce the problem, but could not
do so. Here's what I did:

git checkout 912bd49
git am -3s mbox
Applying: refs.c: add err arguments to reflog functions
Applying: cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs
Applying: bisect: treat BISECT_HEAD as a ref
Applying: refs: Break out check for reflog autocreation
Applying: refs: new public ref function: safe_create_reflog
Applying: git-reflog: add exists command
Applying: update-ref and tag: add --create-reflog arg
Using index info to reconstruct a base tree...
M    builtin/update-ref.c
Falling back to patching base and 3-way merge...
Auto-merging builtin/update-ref.c
CONFLICT (content): Merge conflict in builtin/update-ref.c
error: Failed to merge in the changes.
Patch failed at 0007 update-ref and tag: add --create-reflog arg
The copy of the patch that failed is found in: .git/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

... after resolving the conflict ...

git add builtin/update-ref.c
git am --continue
Applying: update-ref and tag: add --create-reflog arg
Applying: git-stash: use update-ref --create-reflog instead of creating files

And it completes successfully.

Thanks,
Paul