fix off-by-one error in split_ident_line
Commit 4b340cf split the logic to parse an ident line out of pretty.c's format_person_part. But in doing so, it accidentally introduced an off-by-one error that caused it to think that single-character names were invalid. This manifested itself as the "%an" format failing to show anything at all for a single-character name. Reported-by: Brian Turner <bturner@atlassian.com> Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 22, 2012 at 02:12 UTC
d9955fd60fa79da1e7310a55c30e2d87c227d6f9
2 files changed
+8
-1
ident.c
+1
-1
@@ -244,7 +244,7 @@ int split_ident_line(struct ident_split *split, const char *line, int len)
244
if (!split->mail_begin)
245
return status;
246
247
- for (cp = split->mail_begin - 2; line < cp; cp--)
247
+ for (cp = split->mail_begin - 2; line <= cp; cp--)
248
if (!isspace(*cp)) {
249
split->name_end = cp + 1;
250
break;
t/t6006-rev-list-format.sh
+7
@@ -282,4 +282,11 @@ test_expect_success 'oneline with empty message' '
282
test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
283
'
284
285
+test_expect_success 'single-character name is parsed correctly' '
286
+ git commit --author="a <a@example.com>" --allow-empty -m foo &&
287
+ echo "a <a@example.com>" >expect &&
288
+ git log -1 --format="%an <%ae>" >actual &&
289
+ test_cmp expect actual
290
+'
291
+
292
test_done