diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:50:41 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-09-09 14:50:41 -0700 |
| commit | af226bf01e99043f5f3d8bc09ad302d17e0de757 (patch) | |
| tree | f04089cfa49837b0e8dd86b5cc560bda262d08a0 /t/t4203-mailmap.sh | |
| parent | a23274e127fdb1674361271f14f7269f0a019cc2 (diff) | |
| parent | f972a1658a30809db113a3c486b1fe95b56633bf (diff) | |
| download | git-af226bf01e99043f5f3d8bc09ad302d17e0de757.tar.gz git-af226bf01e99043f5f3d8bc09ad302d17e0de757.tar.xz | |
Merge branch 'jk/mailmap-incomplete-line'
* jk/mailmap-incomplete-line:
mailmap: handle mailmap blobs without trailing newlines
Diffstat (limited to 't/t4203-mailmap.sh')
| -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 baa4685dc..ce3eace06 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 ' |