diff options
| author |  Jeff King <peff@peff.net> | 2011-09-07 13:44:56 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2011-09-08 13:52:00 -0700 |
| commit | 7f6e275bc003e04fca63ae1058bb665078f72d7e (patch) | |
| tree | f33c7d6fc07c0351a39f461305e4cf056e590b12 /builtin | |
| parent | for-each-ref: refactor subject and body placeholder parsing (diff) | |
| download | tgif-7f6e275bc003e04fca63ae1058bb665078f72d7e.tar.xz | |
for-each-ref: handle multiline subjects like --pretty
Generally the format of a git tag or commit message is:
subject
body body body
body body body
However, we occasionally see multiline subjects like:
subject
with multiple
lines
body body body
body body body
The rest of git treats these multiline subjects as something
to be concatenated and shown as a single line (e.g., "git
log --pretty=format:%s" will do so since f53bd74). For
consistency, for-each-ref should do the same with its
"%(subject)".
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/for-each-ref.c | 29 |
1 files changed, 24 insertions, 5 deletions
diff --git a/builtin/for-each-ref.c b/builtin/for-each-ref.c index bcea0276f3..ea2112b388 100644 --- a/builtin/for-each-ref.c +++ b/builtin/for-each-ref.c @@ -361,6 +361,18 @@ static const char *copy_email(const char *buf) return xmemdupz(email, eoemail + 1 - email); } +static char *copy_subject(const char *buf, unsigned long len) +{ + char *r = xmemdupz(buf, len); + int i; + + for (i = 0; i < len; i++) + if (r[i] == '\n') + r[i] = ' '; + + return r; +} + static void grab_date(const char *buf, struct atom_value *v, const char *atomname) { const char *eoemail = strstr(buf, "> "); @@ -476,10 +488,17 @@ static void find_subpos(const char *buf, unsigned long sz, /* subject is first non-empty line */ *sub = buf; - /* subject goes to end of line */ - eol = strchrnul(buf, '\n'); - *sublen = eol - buf; - buf = eol; + /* subject goes to first empty line */ + while (*buf && *buf != '\n') { + eol = strchrnul(buf, '\n'); + if (*eol) + eol++; + buf = eol; + } + *sublen = buf - *sub; + /* drop trailing newline, if present */ + if (*sublen && (*sub)[*sublen - 1] == '\n') + *sublen -= 1; /* skip any empty lines */ while (*buf == '\n') @@ -512,7 +531,7 @@ static void grab_sub_body_contents(struct atom_value *val, int deref, struct obj &bodypos, &bodylen); if (!strcmp(name, "subject")) - v->s = xmemdupz(subpos, sublen); + v->s = copy_subject(subpos, sublen); else if (!strcmp(name, "body")) v->s = xmemdupz(bodypos, bodylen); else if (!strcmp(name, "contents")) |