mirror of
https://github.com/git/git
synced 2024-08-27 11:39:22 +00:00
![Marius Storm-Olsen](/assets/img/avatar_default.png)
Signed-off-by: Marius Storm-Olsen <marius@trolltech.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
216 lines
5.4 KiB
Bash
Executable file
216 lines
5.4 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='.mailmap configurations'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
echo one >one &&
|
|
git add one &&
|
|
test_tick &&
|
|
git commit -m initial &&
|
|
echo two >>one &&
|
|
git add one &&
|
|
git commit --author "nick1 <bugs@company.xx>" -m second
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
A U Thor (1):
|
|
initial
|
|
|
|
nick1 (1):
|
|
second
|
|
|
|
EOF
|
|
|
|
test_expect_success 'No mailmap' '
|
|
git shortlog HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
Repo Guy (1):
|
|
initial
|
|
|
|
nick1 (1):
|
|
second
|
|
|
|
EOF
|
|
|
|
test_expect_success 'default .mailmap' '
|
|
echo "Repo Guy <author@example.com>" > .mailmap &&
|
|
git shortlog HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Using a mailmap file in a subdirectory of the repo here, but
|
|
# could just as well have been a file outside of the repository
|
|
cat >expect <<\EOF
|
|
Internal Guy (1):
|
|
second
|
|
|
|
Repo Guy (1):
|
|
initial
|
|
|
|
EOF
|
|
test_expect_success 'mailmap.file set' '
|
|
mkdir internal_mailmap &&
|
|
echo "Internal Guy <bugs@company.xx>" > internal_mailmap/.mailmap &&
|
|
git config mailmap.file internal_mailmap/.mailmap &&
|
|
git shortlog HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
External Guy (1):
|
|
initial
|
|
|
|
Internal Guy (1):
|
|
second
|
|
|
|
EOF
|
|
test_expect_success 'mailmap.file override' '
|
|
echo "External Guy <author@example.com>" >> internal_mailmap/.mailmap &&
|
|
git config mailmap.file internal_mailmap/.mailmap &&
|
|
git shortlog HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
Repo Guy (1):
|
|
initial
|
|
|
|
nick1 (1):
|
|
second
|
|
|
|
EOF
|
|
|
|
test_expect_success 'mailmap.file non-existant' '
|
|
rm internal_mailmap/.mailmap &&
|
|
rmdir internal_mailmap &&
|
|
git shortlog HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
cat >expect <<\EOF
|
|
A U Thor (1):
|
|
initial
|
|
|
|
nick1 (1):
|
|
second
|
|
|
|
EOF
|
|
test_expect_success 'No mailmap files, but configured' '
|
|
rm .mailmap &&
|
|
git shortlog HEAD >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# Extended mailmap configurations should give us the following output for shortlog
|
|
cat >expect <<\EOF
|
|
A U Thor <author@example.com> (1):
|
|
initial
|
|
|
|
CTO <cto@company.xx> (1):
|
|
seventh
|
|
|
|
Other Author <other@author.xx> (2):
|
|
third
|
|
fourth
|
|
|
|
Santa Claus <santa.claus@northpole.xx> (2):
|
|
fifth
|
|
sixth
|
|
|
|
Some Dude <some@dude.xx> (1):
|
|
second
|
|
|
|
EOF
|
|
|
|
test_expect_success 'Shortlog output (complex mapping)' '
|
|
echo three >>one &&
|
|
git add one &&
|
|
test_tick &&
|
|
git commit --author "nick2 <bugs@company.xx>" -m third &&
|
|
|
|
echo four >>one &&
|
|
git add one &&
|
|
test_tick &&
|
|
git commit --author "nick2 <nick2@company.xx>" -m fourth &&
|
|
|
|
echo five >>one &&
|
|
git add one &&
|
|
test_tick &&
|
|
git commit --author "santa <me@company.xx>" -m fifth &&
|
|
|
|
echo six >>one &&
|
|
git add one &&
|
|
test_tick &&
|
|
git commit --author "claus <me@company.xx>" -m sixth &&
|
|
|
|
echo seven >>one &&
|
|
git add one &&
|
|
test_tick &&
|
|
git commit --author "CTO <cto@coompany.xx>" -m seventh &&
|
|
|
|
mkdir internal_mailmap &&
|
|
echo "Committed <committer@example.com>" > internal_mailmap/.mailmap &&
|
|
echo "<cto@company.xx> <cto@coompany.xx>" >> internal_mailmap/.mailmap &&
|
|
echo "Some Dude <some@dude.xx> nick1 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
|
|
echo "Other Author <other@author.xx> nick2 <bugs@company.xx>" >> internal_mailmap/.mailmap &&
|
|
echo "Other Author <other@author.xx> <nick2@company.xx>" >> internal_mailmap/.mailmap &&
|
|
echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
|
|
echo "Santa Claus <santa.claus@northpole.xx> <me@company.xx>" >> internal_mailmap/.mailmap &&
|
|
|
|
git shortlog -e HEAD >actual &&
|
|
test_cmp expect actual
|
|
|
|
'
|
|
|
|
# git log with --pretty format which uses the name and email mailmap placemarkers
|
|
cat >expect <<\EOF
|
|
Author CTO <cto@coompany.xx> maps to CTO <cto@company.xx>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
|
|
Author claus <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
|
|
Author santa <me@company.xx> maps to Santa Claus <santa.claus@northpole.xx>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
|
|
Author nick2 <nick2@company.xx> maps to Other Author <other@author.xx>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
|
|
Author nick2 <bugs@company.xx> maps to Other Author <other@author.xx>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
|
|
Author nick1 <bugs@company.xx> maps to Some Dude <some@dude.xx>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
|
|
Author A U Thor <author@example.com> maps to A U Thor <author@example.com>
|
|
Committer C O Mitter <committer@example.com> maps to Committed <committer@example.com>
|
|
EOF
|
|
|
|
test_expect_success 'Log output (complex mapping)' '
|
|
git log --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
# git blame
|
|
cat >expect <<\EOF
|
|
^3a2fdcb (A U Thor 2005-04-07 15:13:13 -0700 1) one
|
|
7de6f99b (Some Dude 2005-04-07 15:13:13 -0700 2) two
|
|
5815879d (Other Author 2005-04-07 15:14:13 -0700 3) three
|
|
ff859d96 (Other Author 2005-04-07 15:15:13 -0700 4) four
|
|
5ab6d4fa (Santa Claus 2005-04-07 15:16:13 -0700 5) five
|
|
38a42d8b (Santa Claus 2005-04-07 15:17:13 -0700 6) six
|
|
8ddc0386 (CTO 2005-04-07 15:18:13 -0700 7) seven
|
|
EOF
|
|
|
|
test_expect_success 'Blame output (complex mapping)' '
|
|
git blame one >actual &&
|
|
test_cmp expect actual
|
|
'
|
|
|
|
test_done
|