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>

diff --git a/ident.c b/ident.c
index 87c697c2b09692ec8a36d557aa0c73de38223492..5df094d175ab91afb9ead68431f0c99bde7fd03f 100644 (file)
--- 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;
 
        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;
                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
index 444279077e803ca96e48281ae956ea6536317608..244701e96e3ba6669dd52784245f58c6d23386f7 100755 (executable)
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@ -282,4 +282,11 @@ test_expect_success 'oneline with empty message' '
        test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5
 '
 
        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
+'
+

 test_done
 test_done