Skip to content

Commit e2d484c

Browse files
committed
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
2 parents 6c22741 + d9955fd commit e2d484c

File tree

2 files changed

+8
-1
lines changed

2 files changed

+8
-1
lines changed

ident.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,7 @@ int split_ident_line(struct ident_split *split, const char *line, int len)
244244
if (!split->mail_begin)
245245
return status;
246246

247-
for (cp = split->mail_begin - 2; line < cp; cp--)
247+
for (cp = split->mail_begin - 2; line <= cp; cp--)
248248
if (!isspace(*cp)) {
249249
split->name_end = cp + 1;
250250
break;

t/t6006-rev-list-format.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -283,4 +283,11 @@ test_expect_success 'oneline with empty message' '
283283
test_line_count = 5 testg.txt
284284
'
285285

286+
test_expect_success 'single-character name is parsed correctly' '
287+
git commit --author="a <[email protected]>" --allow-empty -m foo &&
288+
echo "a <[email protected]>" >expect &&
289+
git log -1 --format="%an <%ae>" >actual &&
290+
test_cmp expect actual
291+
'
292+
286293
test_done

0 commit comments

Comments
 (0)