diff options
| author | Jeff King <peff@peff.net> | 2012-05-22 02:12:20 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-05-22 11:24:11 -0700 |
| commit | d9955fd60fa79da1e7310a55c30e2d87c227d6f9 (patch) | |
| tree | 5f8af96795b7c072336fc669ccd22fc681302623 | |
| parent | 4b340cfab9c7a18e39bc531d6a6ffaffdf95f62d (diff) | |
| download | git-d9955fd60fa79da1e7310a55c30e2d87c227d6f9.tar.gz git-d9955fd60fa79da1e7310a55c30e2d87c227d6f9.tar.xz | |
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>
| -rw-r--r-- | ident.c | 2 | ||||
| -rwxr-xr-x | t/t6006-rev-list-format.sh | 7 |
2 files changed, 8 insertions, 1 deletions
@@ -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 index 444279077..244701e96 100755 --- 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_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 |