CODEWITHSUNDEEP
gitgit-branch
John Fadria
John Fadria

Reputation: 1945

Patch does not have a valid e-mail address after `git am`

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?

Upvotes: 2

Views: 3489

Answers (1)

VonC
VonC

Reputation: 1328282

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.

Upvotes: 2

Related Questions