Skip to content

Commit

Permalink
Merge branch 'jk/ident-split-fix' into maint
Browse files Browse the repository at this point in the history
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
  • Loading branch information
gitster committed Jun 1, 2012
2 parents 6c22741 + d9955fd commit e2d484c
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 1 deletion.
2 changes: 1 addition & 1 deletion ident.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
7 changes: 7 additions & 0 deletions t/t6006-rev-list-format.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 <[email protected]>" --allow-empty -m foo &&
echo "a <[email protected]>" >expect &&
git log -1 --format="%an <%ae>" >actual &&
test_cmp expect actual
'

test_done

0 comments on commit e2d484c

Please sign in to comment.