After:
git am --signoff < /tmp/diff_api_public.patch
Output was:
Patch does not have a valid e-mail address.
And now, I have the repository in the state:
project-folder[branch-name|AM 1/1]$
What's next to regain the branch correct?
Asked
Active
Viewed 3,444 times
2
John Fadria
- 1,863
- 2
- 25
- 31
-
Nothing: you should have a new commit on that branch now (http://stackoverflow.com/a/2250170/6309) – VonC Feb 27 '15 at 06:58
-
thanks @VonC . But what's **AM 1/1** mean? . And How to make it go away? – John Fadria Feb 27 '15 at 07:00
-
What `git status` returns? – VonC Feb 27 '15 at 07:12
-
@VonC On branch You are in the middle of an am session. (fix conflicts and then run "git am --continue") (use "git am --skip" to skip this patch) (use "git am --abort" to restore the original branch) – John Fadria Feb 27 '15 at 07:13
-
Sorry @VonC I forgot to say that the output of the git am was `Patch does not have a valid e-mail address` – John Fadria Feb 27 '15 at 07:19
1 Answers
2
Looking at contrib/completion/git-prompt.sh, this particular prompt is displayed where there is a .git/rebase-apply/applying file.
That should means the path was applied with conflict.
Or, in this instance, that the patch wasn't applied fully (Patch does not have a valid e-mail address)
The status is clear:
- use "
git am --skip" to skip this patch - use "
git am --abort" to restore the original branch
As a workaround, in order to apply that patch, you an have a look at "git: Patch does not have a valid e-mail address".
- either use
git apply - or edit the patch to add the proper email.
-
The problem was the `Patch does not have a valid e-mail address`. I don't have conflict markers. If I `git am --continue` the output is `Patch does not have a valid e-mail address` – John Fadria Feb 27 '15 at 07:22