Skip to content

Conversation

@gwd
Copy link
Contributor

@gwd gwd commented Oct 30, 2020

OK, last PR for a while. git am is actually somewhat relaxed in what it accepts as far as email-looking things. There are two things I've encountered so far which go-gitdiff chokes on that git am accepts:

  1. git am will accept a file which starts with the From: line

  2. git am will accept email-only "From" lines of the form From: <foo@company.com>.

With these changes, everything works for my use case.

George Dunlap added 2 commits October 30, 2020 17:54
`git am` will accept patches which aren't fully RFC-compliant, as long
as they start with `From` and have a `Subject` line. Relax
PatchPatchHeader() so that it will accept such patches as well.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
`git am` will tolerate patches of the form:

```
From: <foo@company.com>
```

In this case, the `Author` field will contain `foo@company.com
<foo@company.com>`.  Duplicate this behavior.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>
@bluekeyes bluekeyes merged commit b846b2c into bluekeyes:master Oct 31, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants