mirror of
https://github.com/git/git
synced 2024-08-27 19:49:21 +00:00
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
This commit is contained in:
commit
e2d484c47a
2
ident.c
2
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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue