From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 May 2012 19:05:26 +0000 (-0700)
Subject: Merge branch 'jk/ident-split-fix'
X-Git-Tag: v1.7.11-rc0~8
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/500cf7cbb49f9917194ccab4563376eeb025c152?hp=-c

Merge branch 'jk/ident-split-fix'

An author/committer name that is a single character was mishandled as an
invalid name by mistake.
---

500cf7cbb49f9917194ccab4563376eeb025c152
diff --combined t/t6006-rev-list-format.sh
index a01d244502,244701e96e..f94f0c48e6
--- a/t/t6006-rev-list-format.sh
+++ b/t/t6006-rev-list-format.sh
@@@ -188,23 -188,23 +188,23 @@@ test_expect_success 'empty email' 
  
  test_expect_success 'del LF before empty (1)' '
  	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD^^ >actual &&
 -	test $(wc -l <actual) = 2
 +	test_line_count = 2 actual
  '
  
  test_expect_success 'del LF before empty (2)' '
  	git show -s --pretty=format:"%s%n%-b%nThanks%n" HEAD >actual &&
 -	test $(wc -l <actual) = 6 &&
 +	test_line_count = 6 actual &&
  	grep "^$" actual
  '
  
  test_expect_success 'add LF before non-empty (1)' '
  	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD^^ >actual &&
 -	test $(wc -l <actual) = 2
 +	test_line_count = 2 actual
  '
  
  test_expect_success 'add LF before non-empty (2)' '
  	git show -s --pretty=format:"%s%+b%nThanks%n" HEAD >actual &&
 -	test $(wc -l <actual) = 6 &&
 +	test_line_count = 6 actual &&
  	grep "^$" actual
  '
  
@@@ -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