Permalink
Browse files

Merge branch 'jk/ident-split-fix' into next

An author/committer name that is a single character was mishandled as an
invalid name by mistake.

By Jeff King
* jk/ident-split-fix:
  fix off-by-one error in split_ident_line
  • Loading branch information...
2 parents 6124da2 + d9955fd commit 811c9ec16b393c140af9bd848c9c67447b682446 @gitster gitster committed May 23, 2012
Showing with 8 additions and 1 deletion.
  1. +1 −1 ident.c
  2. +7 −0 t/t6006-rev-list-format.sh
View
@@ -244,7 +244,7 @@ int split_ident_line(struct ident_split *split, const char *line, int len)
if (!split->mail_begin)
return status;
- for (cp = split->mail_begin - 2; line < cp; cp--)
+ for (cp = split->mail_begin - 2; line <= cp; cp--)
if (!isspace(*cp)) {
split->name_end = cp + 1;
break;
@@ -283,4 +283,11 @@ test_expect_success 'oneline with empty message' '
test_line_count = 5 testg.txt
'
+test_expect_success 'single-character name is parsed correctly' '
+ git commit --author="a <a@example.com>" --allow-empty -m foo &&
+ echo "a <a@example.com>" >expect &&
+ git log -1 --format="%an <%ae>" >actual &&
+ test_cmp expect actual
+'
+
test_done

0 comments on commit 811c9ec

Please sign in to comment.