diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:16 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-11-10 18:02:16 +0900 |
| commit | c22f63c40f0a576f3938dfd26c976ec052aa7fe2 (patch) | |
| tree | a7f627aaa3d46fd42977f4ec64afd0582bf295b8 /t/test-lib.sh | |
| parent | 5731ca365789a04faecc281be24ea2eb0e438215 (diff) | |
| parent | d8b8217c8a16944dc61a1553464efabc450a6680 (diff) | |
| download | git-c22f63c40f0a576f3938dfd26c976ec052aa7fe2.tar.gz | |
Merge branch 'pb/pretty-email-without-domain-part'
The custom format for "git log --format=<format>" learned the l/L
placeholder that is similar to e/E that fills in the e-mail
address, but only the local part on the left side of '@'.
* pb/pretty-email-without-domain-part:
pretty: add "%aL" etc. to show local-part of email addresses
t4203: use test-lib.sh definitions
t6006: use test-lib.sh definitions
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index e06fa02a0e..46c4440843 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -404,9 +404,13 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' unset XDG_CACHE_HOME unset XDG_CONFIG_HOME unset GITPERLLIB -GIT_AUTHOR_EMAIL=author@example.com +TEST_AUTHOR_LOCALNAME=author +TEST_AUTHOR_DOMAIN=example.com +GIT_AUTHOR_EMAIL=${TEST_AUTHOR_LOCALNAME}@${TEST_AUTHOR_DOMAIN} GIT_AUTHOR_NAME='A U Thor' -GIT_COMMITTER_EMAIL=committer@example.com +TEST_COMMITTER_LOCALNAME=committer +TEST_COMMITTER_DOMAIN=example.com +GIT_COMMITTER_EMAIL=${TEST_COMMITTER_LOCALNAME}@${TEST_COMMITTER_DOMAIN} GIT_COMMITTER_NAME='C O Mitter' GIT_MERGE_VERBOSITY=5 GIT_MERGE_AUTOEDIT=no |