summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-01-06 12:21:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-01-07 02:41:43 (GMT)
commitf7ab5c793707082d41e19093f536cdc0d45d8830 (patch)
treed754745b47aa69a50130c0f1d2f37a8d9f01e2fc /pretty.c
parent5682694a3c1f272f230301f2b11a834a141d1efe (diff)
downloadgit-f7ab5c793707082d41e19093f536cdc0d45d8830.zip
git-f7ab5c793707082d41e19093f536cdc0d45d8830.tar.gz
git-f7ab5c793707082d41e19093f536cdc0d45d8830.tar.bz2
custom pretty format: tolerate empty e-mail address
When e-mail address is empty (e.g. "A U Thor <>"), --pretty=format misparsed the commit header and did not pick up the date field correctly. Noticed by Marco, fixed slightly differently with additional sanity check and with a test. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c16
1 files changed, 12 insertions, 4 deletions
diff --git a/pretty.c b/pretty.c
index 5b1078b..b987ff2 100644
--- a/pretty.c
+++ b/pretty.c
@@ -292,7 +292,18 @@ static void format_person_part(struct strbuf *sb, char part,
/* parse name */
for (end = 0; end < len && msg[end] != '<'; end++)
; /* do nothing */
+ /*
+ * If it does not even have a '<' and '>', that is
+ * quite a bogus commit author and we discard it;
+ * this is in line with add_user_info() that is used
+ * in the normal codepath. When end points at the '<'
+ * that we found, it should have matching '>' later,
+ * which means start (beginning of email address) must
+ * be strictly below len.
+ */
start = end + 1;
+ if (start >= len - 1)
+ return;
while (end > 0 && isspace(msg[end - 1]))
end--;
if (part == 'n') { /* name */
@@ -300,11 +311,8 @@ static void format_person_part(struct strbuf *sb, char part,
return;
}
- if (start >= len)
- return;
-
/* parse email */
- for (end = start + 1; end < len && msg[end] != '>'; end++)
+ for (end = start; end < len && msg[end] != '>'; end++)
; /* do nothing */
if (end >= len)