diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-07-29 01:54:54 -0700 |
| commit | 7061cf0f205e86613c3a3306fdfedf2a5dcc8a65 (patch) | |
| tree | e0595e44fc820032fd5ee942a031439f2e6da3b1 /builtin-mailinfo.c | |
| parent | ac64a722072bb348476a8a029de9a82073e07fba (diff) | |
| parent | a633fca0c056aa221d23493c276d3713191621b3 (diff) | |
| download | git-7061cf0f205e86613c3a3306fdfedf2a5dcc8a65.tar.gz | |
Merge branch 'lt/setup' into __/setup-n-mv
This merges the new built-in calling convention code into Johannes's
builtin-mv topic in order to resolve their conflicts early on.
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'builtin-mailinfo.c')
| -rw-r--r-- | builtin-mailinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c index ac53f76f68..24a4fc63b3 100644 --- a/builtin-mailinfo.c +++ b/builtin-mailinfo.c @@ -446,7 +446,7 @@ static int read_one_header_line(char *line, int sz, FILE *in) break; } /* Count mbox From headers as headers */ - if (!ofs && !memcmp(line, "From ", 5)) + if (!ofs && (!memcmp(line, "From ", 5) || !memcmp(line, ">From ", 6))) ofs = 1; return ofs; } @@ -836,7 +836,7 @@ int mailinfo(FILE *in, FILE *out, int ks, const char *encoding, static const char mailinfo_usage[] = "git-mailinfo [-k] [-u | --encoding=<encoding>] msg patch <mail >info"; -int cmd_mailinfo(int argc, const char **argv, char **envp) +int cmd_mailinfo(int argc, const char **argv, const char *prefix) { /* NEEDSWORK: might want to do the optional .git/ directory * discovery |