1. Stefan Saasen
  2. git


Jeff King  committed d9955fd

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>

  • Participants
  • Parent commits 4b340cf
  • Branches master

Comments (0)

Files changed (2)

File ident.c

View file
 	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;

File t/t6006-rev-list-format.sh

View file
 	test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
+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