diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:57:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-18 11:57:33 -0700 |
| commit | 19230ab8a80d0a78ac396234c557f0dd8d564a04 (patch) | |
| tree | a91476706c5d712cf13c476b339889c9db00e99e /t | |
| parent | t7406-submodule-update: add missing && (diff) | |
| parent | mailmap: handle mailmap blobs without trailing newlines (diff) | |
| download | tgif-19230ab8a80d0a78ac396234c557f0dd8d564a04.tar.xz | |
Merge branch 'jk/mailmap-incomplete-line' into maint
* jk/mailmap-incomplete-line:
mailmap: handle mailmap blobs without trailing newlines
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4203-mailmap.sh | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/t/t4203-mailmap.sh b/t/t4203-mailmap.sh index baa4685dcc..ce3eace065 100755 --- a/t/t4203-mailmap.sh +++ b/t/t4203-mailmap.sh @@ -202,7 +202,8 @@ test_expect_success 'setup mailmap blob tests' ' Blob Guy <author@example.com> Blob Guy <bugs@company.xx> EOF - git add just-bugs both && + printf "Tricky Guy <author@example.com>" >no-newline && + git add just-bugs both no-newline && git commit -m "my mailmaps" && echo "Repo Guy <author@example.com>" >.mailmap && echo "Internal Guy <author@example.com>" >internal.map @@ -286,6 +287,19 @@ test_expect_success 'mailmap.blob defaults to HEAD:.mailmap in bare repo' ' ) ' +test_expect_success 'mailmap.blob can handle blobs without trailing newline' ' + cat >expect <<-\EOF && + Tricky Guy (1): + initial + + nick1 (1): + second + + EOF + git -c mailmap.blob=map:no-newline shortlog HEAD >actual && + test_cmp expect actual +' + test_expect_success 'cleanup after mailmap.blob tests' ' rm -f .mailmap ' |