Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'jk/ident-split-fix'

An author/committer name that is a single character was mishandled as an
invalid name by mistake.
  • Loading branch information...
commit 500cf7cbb49f9917194ccab4563376eeb025c152 2 parents 0bc8bea + d9955fd
Junio C Hamano gitster authored
Showing with 8 additions and 1 deletion.
  1. +1 −1  ident.c
  2. +7 −0 t/t6006-rev-list-format.sh
2  ident.c
View
@@ -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;
7 t/t6006-rev-list-format.sh
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.