diff options
| author |  Ariadne Conill <ariadne@dereferenced.org> | 2019-07-15 07:41:06 -0500 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-07-15 11:44:28 -0700 |
| commit | ef60740e9efb364d8bb0fba120adecf860cc8ed0 (patch) | |
| tree | 67a82d7702905667666b5d7e5da33c3843b06a83 | |
| parent | documentation: mention --no-use-mailmap and log.mailmap false setting (diff) | |
| download | tgif-ef60740e9efb364d8bb0fba120adecf860cc8ed0.tar.xz | |
tests: defang pager tests by explicitly disabling the log.mailmap warning
In the previous patch, we added a deprecation warning for the current
log.mailmap setting. This warning only appears when git is attached to
a controlling terminal. Some tests however run under an emulated
terminal, so we need to disable the warning for those tests.
Thanks to Junio for suggesting that we do this in the setup function.
Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t7006-pager.sh | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 00e09a375c..7976fa7bcc 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -7,6 +7,8 @@ test_description='Test automatic use of a pager.' . "$TEST_DIRECTORY"/lib-terminal.sh test_expect_success 'setup' ' + : squelch advice messages during the transition && + git config --global log.mailmap false && sane_unset GIT_PAGER GIT_PAGER_IN_USE && test_unconfig core.pager && |