From: Junio C Hamano <gitster@pobox.com> Date: Fri, 1 Jun 2012 20:01:36 +0000 (-0700) Subject: Merge branch 'jk/ident-split-fix' into maint X-Git-Tag: v1.7.10.4~5 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e2d484c47a3445a288f4e45ee8365c912eebb26f;p=git.git 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 --- e2d484c47a3445a288f4e45ee8365c912eebb26f diff --cc t/t6006-rev-list-format.sh index a01d24450,244701e96..f94f0c48e --- a/t/t6006-rev-list-format.sh +++ b/t/t6006-rev-list-format.sh @@@ -278,9 -278,15 +278,16 @@@ test_expect_success 'oneline with empt git commit -m "dummy" --allow-empty && git filter-branch --msg-filter "sed -e s/dummy//" HEAD^^.. && git rev-list --oneline HEAD >test.txt && - test $(git rev-list --oneline HEAD | wc -l) -eq 5 && - test $(git rev-list --oneline --graph HEAD | wc -l) -eq 5 + test_line_count = 5 test.txt && + git rev-list --oneline --graph HEAD >testg.txt && + 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