diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:01:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-06-01 13:01:36 -0700 |
| commit | e2d484c47a3445a288f4e45ee8365c912eebb26f (patch) | |
| tree | 0bf7fa4305ae6219db4b27c952a7eefea1873ac0 | |
| parent | 6c227410b5e1bb014896514f90be55503c4a26c9 (diff) | |
| parent | d9955fd60fa79da1e7310a55c30e2d87c227d6f9 (diff) | |
| download | git-e2d484c47a3445a288f4e45ee8365c912eebb26f.tar.gz | |
Merge branch 'jk/ident-split-fix' into maint
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
| -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 a01d244502..f94f0c48e6 100755 --- 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 |