#!/bin/sh test_description='.mailmap configurations' GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME . ./test-lib.sh test_expect_success 'setup commits and contacts file' ' test_commit initial one one && test_commit --author "nick1 " --append second one two ' test_expect_success 'check-mailmap no arguments' ' test_must_fail git check-mailmap ' test_expect_success 'check-mailmap arguments' ' cat >expect <<-EOF && $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> nick1 EOF git check-mailmap \ "$GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL>" \ "nick1 " >actual && test_cmp expect actual ' test_expect_success 'check-mailmap --stdin' ' cat >expect <<-EOF && $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> nick1 EOF git check-mailmap --stdin actual && test_cmp expect actual ' test_expect_success 'check-mailmap --stdin arguments: no mapping' ' test_when_finished "rm contacts" && cat >contacts <<-EOF && $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> nick1 EOF cat >expect <<-\EOF && Internal Guy EOF cat contacts >>expect && git check-mailmap --stdin "Internal Guy " \ actual && test_cmp expect actual ' test_expect_success 'check-mailmap --stdin arguments: mapping' ' test_when_finished "rm .mailmap" && cat >.mailmap <<-EOF && New Name <$GIT_AUTHOR_EMAIL> EOF cat >stdin <<-EOF && Old Name <$GIT_AUTHOR_EMAIL> EOF cp .mailmap expect && git check-mailmap --stdin actual && test_cmp expect actual && cat .mailmap >>expect && git check-mailmap --stdin "Another Old Name <$GIT_AUTHOR_EMAIL>" \ actual && test_cmp expect actual ' test_expect_success 'check-mailmap bogus contact' ' test_must_fail git check-mailmap bogus ' test_expect_success 'check-mailmap bogus contact --stdin' ' test_must_fail git check-mailmap --stdin bogus expect <<-EOF && $GIT_AUTHOR_NAME (1): initial nick1 (1): second EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'setup default .mailmap' ' cat >default.map <<-EOF Repo Guy <$GIT_AUTHOR_EMAIL> EOF ' test_expect_success 'test default .mailmap' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && cat >expect <<-\EOF && Repo Guy (1): initial nick1 (1): second EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'mailmap.file set' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && test_config mailmap.file internal.map && cat >internal.map <<-\EOF && Internal Guy EOF cat >expect <<-\EOF && Internal Guy (1): second Repo Guy (1): initial EOF git shortlog HEAD >actual && test_cmp expect actual && # The internal_mailmap/.mailmap file is an a subdirectory, but # as shown here it can also be outside the repository test_when_finished "rm -rf sub-repo" && git clone . sub-repo && ( cd sub-repo && cp ../.mailmap . && git config mailmap.file ../internal.map && git shortlog HEAD >actual && test_cmp ../expect actual ) ' test_expect_success 'mailmap.file override' ' test_config mailmap.file internal.map && cat >internal.map <<-EOF && Internal Guy External Guy <$GIT_AUTHOR_EMAIL> EOF cat >expect <<-\EOF && External Guy (1): initial Internal Guy (1): second EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'mailmap.file non-existent' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && cat >expect <<-\EOF && Repo Guy (1): initial nick1 (1): second EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'name entry after email entry' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && test_config mailmap.file internal.map && cat >internal.map <<-\EOF && Internal Guy EOF cat >expect <<-\EOF && Internal Guy (1): second Repo Guy (1): initial EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'name entry after email entry, case-insensitive' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && test_config mailmap.file internal.map && cat >internal.map <<-\EOF && Internal Guy EOF cat >expect <<-\EOF && Internal Guy (1): second Repo Guy (1): initial EOF git shortlog HEAD >actual && test_cmp expect actual && cat >internal.map <<-\EOF && NiCk NICK1 EOF cat >expect <<-\EOF && NiCk (1): second Repo Guy (1): initial EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'No mailmap files, but configured' ' cat >expect <<-EOF && $GIT_AUTHOR_NAME (1): initial nick1 (1): second EOF git shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'setup mailmap blob tests' ' git checkout -b map && test_when_finished "git checkout main" && cat >just-bugs <<-\EOF && Blob Guy EOF cat >both <<-EOF && Blob Guy <$GIT_AUTHOR_EMAIL> Blob Guy EOF printf "Tricky Guy <$GIT_AUTHOR_EMAIL>" >no-newline && git add just-bugs both no-newline && git commit -m "my mailmaps" && cat >internal.map <<-EOF Internal Guy <$GIT_AUTHOR_EMAIL> EOF ' test_expect_success 'mailmap.blob set' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && cat >expect <<-\EOF && Blob Guy (1): second Repo Guy (1): initial EOF git -c mailmap.blob=map:just-bugs shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'mailmap.blob overrides .mailmap' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && cat >expect <<-\EOF && Blob Guy (2): initial second EOF git -c mailmap.blob=map:both shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'mailmap.file overrides mailmap.blob' ' cat >expect <<-\EOF && Blob Guy (1): second Internal Guy (1): initial EOF git \ -c mailmap.blob=map:both \ -c mailmap.file=internal.map \ shortlog HEAD >actual && test_cmp expect actual ' test_expect_success 'mailmap.file can be missing' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && test_config mailmap.file nonexistent && cat >expect <<-\EOF && Repo Guy (1): initial nick1 (1): second EOF git shortlog HEAD >actual 2>err && test_must_be_empty err && test_cmp expect actual ' test_expect_success 'mailmap.blob can be missing' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && cat >expect <<-\EOF && Repo Guy (1): initial nick1 (1): second EOF git -c mailmap.blob=map:nonexistent shortlog HEAD >actual 2>err && test_must_be_empty err && test_cmp expect actual ' test_expect_success 'mailmap.blob might be the wrong type' ' test_when_finished "rm .mailmap" && cp default.map .mailmap && git -c mailmap.blob=HEAD: shortlog HEAD >actual 2>err && test_i18ngrep "mailmap is not a blob" err && test_cmp expect actual ' test_expect_success 'mailmap.blob defaults to off in non-bare repo' ' git init non-bare && ( cd non-bare && test_commit one .mailmap "Fake Name <$GIT_AUTHOR_EMAIL>" && cat >expect <<-\EOF && 1 Fake Name EOF git shortlog -ns HEAD >actual && test_cmp expect actual && rm .mailmap && cat >expect <<-EOF && 1 $GIT_AUTHOR_NAME EOF git shortlog -ns HEAD >actual && test_cmp expect actual ) ' test_expect_success 'mailmap.blob defaults to HEAD:.mailmap in bare repo' ' git clone --bare non-bare bare && ( cd bare && cat >expect <<-\EOF && 1 Fake Name EOF git shortlog -ns HEAD >actual && test_cmp expect actual ) ' 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 'single-character name' ' test_when_finished "rm .mailmap" && cat >.mailmap <<-EOF && A <$GIT_AUTHOR_EMAIL> EOF cat >expect <<-EOF && 1 A <$GIT_AUTHOR_EMAIL> 1 nick1 EOF git shortlog -es HEAD >actual && test_cmp expect actual ' test_expect_success 'preserve canonical email case' ' test_when_finished "rm .mailmap" && cat >.mailmap <<-EOF && <$GIT_AUTHOR_EMAIL> EOF cat >expect <<-EOF && 1 $GIT_AUTHOR_NAME 1 nick1 EOF git shortlog -es HEAD >actual && test_cmp expect actual ' test_expect_success 'gitmailmap(5) example output: setup' ' test_create_repo doc && test_commit -C doc --author "Joe Developer " A && test_commit -C doc --author "Joe R. Developer " B && test_commit -C doc --author "Jane Doe " C && test_commit -C doc --author "Jane Doe " D && test_commit -C doc --author "Jane D. " E ' test_expect_success 'gitmailmap(5) example output: example #1' ' test_config -C doc mailmap.file ../doc.map && cat >doc.map <<-\EOF && Joe R. Developer Jane Doe Jane Doe EOF cat >expect <<-\EOF && Author Joe Developer maps to Joe R. Developer Committer C O Mitter maps to C O Mitter Author Joe R. Developer maps to Joe R. Developer Committer C O Mitter maps to C O Mitter Author Jane Doe maps to Jane Doe Committer C O Mitter maps to C O Mitter Author Jane Doe maps to Jane Doe Committer C O Mitter maps to C O Mitter Author Jane D maps to Jane Doe Committer C O Mitter maps to C O Mitter EOF git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'gitmailmap(5) example output: example #2' ' test_config -C doc mailmap.file ../doc.map && cat >doc.map <<-\EOF && Joe R. Developer Jane Doe Jane Doe EOF cat >expect <<-\EOF && Author Joe Developer maps to Joe R. Developer Committer C O Mitter maps to C O Mitter Author Joe R. Developer maps to Joe R. Developer Committer C O Mitter maps to C O Mitter Author Jane Doe maps to Jane Doe Committer C O Mitter maps to C O Mitter Author Jane Doe maps to Jane Doe Committer C O Mitter maps to C O Mitter Author Jane D maps to Jane Doe Committer C O Mitter maps to C O Mitter EOF git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'gitmailmap(5) example output: example #3' ' test_config -C doc mailmap.file ../doc.map && cat >>doc.map <<-\EOF && Joe R. Developer Joe Jane Doe Jane EOF test_commit -C doc --author "Joe " F && test_commit -C doc --author "Jane " G && cat >>expect <<-\EOF && Author Joe maps to Joe R. Developer Committer C O Mitter maps to C O Mitter Author Jane maps to Jane Doe Committer C O Mitter maps to C O Mitter EOF git -C doc log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'Shortlog output (complex mapping)' ' test_config mailmap.file complex.map && cat >complex.map <<-EOF && Committed <$GIT_COMMITTER_EMAIL> Some Dude nick1 Other Author nick2 Other Author Santa Claus EOF test_commit --author "nick2 " --append third one three && test_commit --author "nick2 " --append fourth one four && test_commit --author "santa " --append fifth one five && test_commit --author "claus " --append sixth one six && test_commit --author "CTO " --append seventh one seven && cat >expect <<-EOF && $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> (1): initial CTO (1): seventh Other Author (2): third fourth Santa Claus (2): fifth sixth Some Dude (1): second EOF git shortlog -e HEAD >actual && test_cmp expect actual ' test_expect_success 'Log output (complex mapping)' ' test_config mailmap.file complex.map && cat >expect <<-EOF && Author CTO maps to CTO Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author claus maps to Santa Claus Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author santa maps to Santa Claus Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author nick2 maps to Other Author Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author nick2 maps to Other Author Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author nick1 maps to Some Dude Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> Author $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> maps to $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> Committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> maps to Committed <$GIT_COMMITTER_EMAIL> EOF git log --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'Log output (local-part email address)' ' cat >expect <<-EOF && Author email cto@coompany.xx has local-part cto Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME Author email me@company.xx has local-part me Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME Author email me@company.xx has local-part me Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME Author email nick2@company.xx has local-part nick2 Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME Author email bugs@company.xx has local-part bugs Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME Author email bugs@company.xx has local-part bugs Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME Author email author@example.com has local-part author Committer email $GIT_COMMITTER_EMAIL has local-part $TEST_COMMITTER_LOCALNAME EOF git log --pretty=format:"Author email %ae has local-part %al%nCommitter email %ce has local-part %cl%n" >actual && test_cmp expect actual ' test_expect_success 'Log output with --use-mailmap' ' test_config mailmap.file complex.map && cat >expect <<-EOF && Author: CTO Author: Santa Claus Author: Santa Claus Author: Other Author Author: Other Author Author: Some Dude Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF git log --use-mailmap >log && grep Author log >actual && test_cmp expect actual ' test_expect_success 'Log output with log.mailmap' ' test_config mailmap.file complex.map && cat >expect <<-EOF && Author: CTO Author: Santa Claus Author: Santa Claus Author: Other Author Author: Other Author Author: Some Dude Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF git -c log.mailmap=True log >log && grep Author log >actual && test_cmp expect actual ' test_expect_success 'log.mailmap=false disables mailmap' ' cat >expect <<-EOF && Author: CTO Author: claus Author: santa Author: nick2 Author: nick2 Author: nick1 Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF git -c log.mailmap=false log >log && grep Author log >actual && test_cmp expect actual ' test_expect_success '--no-use-mailmap disables mailmap' ' cat >expect <<-EOF && Author: CTO Author: claus Author: santa Author: nick2 Author: nick2 Author: nick1 Author: $GIT_AUTHOR_NAME <$GIT_AUTHOR_EMAIL> EOF git log --no-use-mailmap >log && grep Author log >actual && test_cmp expect actual ' test_expect_success 'Grep author with --use-mailmap' ' test_config mailmap.file complex.map && cat >expect <<-\EOF && Author: Santa Claus Author: Santa Claus EOF git log --use-mailmap --author Santa >log && grep Author log >actual && test_cmp expect actual ' test_expect_success 'Grep author with log.mailmap' ' test_config mailmap.file complex.map && cat >expect <<-\EOF && Author: Santa Claus Author: Santa Claus EOF git -c log.mailmap=True log --author Santa >log && grep Author log >actual && test_cmp expect actual ' test_expect_success 'log.mailmap is true by default these days' ' test_config mailmap.file complex.map && git log --author Santa >log && grep Author log >actual && test_cmp expect actual ' test_expect_success 'Only grep replaced author with --use-mailmap' ' test_config mailmap.file complex.map && git log --use-mailmap --author "" >actual && test_must_be_empty actual ' test_expect_success 'Blame --porcelain output (complex mapping)' ' test_config mailmap.file complex.map && cat >expect <<-EOF && 1 1 1 A U Thor 2 2 1 Some Dude 3 3 1 Other Author 4 4 1 Other Author 5 5 1 Santa Claus 6 6 1 Santa Claus 7 7 1 CTO EOF git blame --porcelain one >actual.blame && NUM="[0-9][0-9]*" && sed -n actual.fuzz \ -e "s/^author //p" \ -e "s/^$OID_REGEX \\($NUM $NUM $NUM\\)$/\\1/p" && test_cmp expect actual.fuzz ' test_expect_success 'Blame output (complex mapping)' ' git -c mailmap.file=complex.map blame one >a && git blame one >b && test_file_not_empty a && ! cmp a b ' test_expect_success 'commit --author honors mailmap' ' test_config mailmap.file complex.map && cat >expect <<-\EOF && Some Dude EOF test_must_fail git commit --author "nick" --allow-empty -meight && git commit --author "Some Dude" --allow-empty -meight && git show --pretty=format:"%an <%ae>%n" >actual && test_cmp expect actual ' test_expect_success 'comment syntax: setup' ' test_create_repo comm && test_commit -C comm --author "A " A && test_commit -C comm --author "B " B && test_commit -C comm --author "C <#@example.com>" C && test_commit -C comm --author "D " D && test_config -C comm mailmap.file ../doc.map && cat >>doc.map <<-\EOF && # Ah ; Bee Cee <#@example.com> Dee EOF cat >expect <<-\EOF && Author A maps to A Committer C O Mitter maps to C O Mitter Author B maps to ; Bee Committer C O Mitter maps to C O Mitter Author C <#@example.com> maps to Cee Committer C O Mitter maps to C O Mitter Author D maps to Dee Committer C O Mitter maps to C O Mitter EOF git -C comm log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'whitespace syntax: setup' ' test_create_repo space && test_commit -C space --author "A " A && test_commit -C space --author "B " B && test_commit -C space --author " C " C && test_commit -C space --author " D " D && test_commit -C space --author "E E " E && test_commit -C space --author "F F " F && test_commit -C space --author "G G " G && test_commit -C space --author "H H " H && test_config -C space mailmap.file ../space.map && cat >>space.map <<-\EOF && Ah < a@example.com > Bee < b@example.com > Cee C dee D eee E E eff F F gee G G aitch H H EOF cat >expect <<-\EOF && Author A maps to A Committer C O Mitter maps to C O Mitter Author B maps to B Committer C O Mitter maps to C O Mitter Author C maps to Cee Committer C O Mitter maps to C O Mitter Author D maps to dee Committer C O Mitter maps to C O Mitter Author E E maps to eee Committer C O Mitter maps to C O Mitter Author F F maps to eff Committer C O Mitter maps to C O Mitter Author G G maps to gee Committer C O Mitter maps to C O Mitter Author H H maps to H H Committer C O Mitter maps to C O Mitter EOF git -C space log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'empty syntax: setup' ' test_create_repo empty && test_commit -C empty --author "A <>" A && test_commit -C empty --author "B " B && test_commit -C empty --author "C " C && test_config -C empty mailmap.file ../empty.map && cat >>empty.map <<-\EOF && Ah <> Bee <> Cee <> EOF cat >expect <<-\EOF && Author A <> maps to Bee Committer C O Mitter maps to C O Mitter Author B maps to B Committer C O Mitter maps to C O Mitter Author C maps to C Committer C O Mitter maps to C O Mitter EOF git -C empty log --reverse --pretty=format:"Author %an <%ae> maps to %aN <%aE>%nCommitter %cn <%ce> maps to %cN <%cE>%n" >actual && test_cmp expect actual ' test_expect_success 'set up mailmap location tests' ' git init --bare loc-bare && git --git-dir=loc-bare --work-tree=. commit \ --allow-empty -m foo --author="Orig " && echo "New " >loc-bare/.mailmap ' test_expect_success 'bare repo with --work-tree finds mailmap at top-level' ' git -C loc-bare --work-tree=. log -1 --format=%aE >actual && echo new@example.com >expect && test_cmp expect actual ' test_expect_success 'bare repo does not look in current directory' ' git -C loc-bare log -1 --format=%aE >actual && echo orig@example.com >expect && test_cmp expect actual ' test_expect_success 'non-git shortlog respects mailmap in current dir' ' git --git-dir=loc-bare log -1 >input && nongit cp "$TRASH_DIRECTORY/loc-bare/.mailmap" . && nongit git shortlog -s actual && echo " 1 New" >expect && test_cmp expect actual ' test_expect_success 'shortlog on stdin respects mailmap from repo' ' cp loc-bare/.mailmap . && git shortlog -s actual && echo " 1 New" >expect && test_cmp expect actual ' test_expect_success 'find top-level mailmap from subdir' ' git clone loc-bare loc-wt && cp loc-bare/.mailmap loc-wt && mkdir loc-wt/subdir && git -C loc-wt/subdir log -1 --format=%aE >actual && echo new@example.com >expect && test_cmp expect actual ' test_expect_success SYMLINKS 'set up symlink tests' ' git commit --allow-empty -m foo --author="Orig " && echo "New " >map && rm -f .mailmap ' test_expect_success SYMLINKS 'symlinks respected in mailmap.file' ' test_when_finished "rm symlink" && ln -s map symlink && git -c mailmap.file="$(pwd)/symlink" log -1 --format=%aE >actual && echo "new@example.com" >expect && test_cmp expect actual ' test_expect_success SYMLINKS 'symlinks respected in non-repo shortlog' ' git log -1 >input && test_when_finished "nongit rm .mailmap" && nongit ln -sf "$TRASH_DIRECTORY/map" .mailmap && nongit git shortlog -s actual && echo " 1 New" >expect && test_cmp expect actual ' test_expect_success SYMLINKS 'symlinks not respected in-tree' ' test_when_finished "rm .mailmap" && ln -s map .mailmap && git log -1 --format=%aE >actual && echo "orig@example.com" >expect && test_cmp expect actual ' test_done