Merge branch 'jk/ident-split-fix'

An author/committer name that is a single character was mishandled as an invalid name by mistake.
git-mirror · May 25, 2012 · 500cf7c · 500cf7c
2 parents 0bc8bea + d9955fd
commit 500cf7c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/ident.c b/ident.c
@@ -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;

diff --git a/t/t6006-rev-list-format.sh b/t/t6006-rev-list-format.sh
@@ -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