Skip to content

Commit ef60740

Browse files
kaniinigitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 2d9c569 commit ef60740

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

t/t7006-pager.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ test_description='Test automatic use of a pager.'
77
. "$TEST_DIRECTORY"/lib-terminal.sh
88

99
test_expect_success 'setup' '
10+
: squelch advice messages during the transition &&
11+
git config --global log.mailmap false &&
1012
sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
1113
test_unconfig core.pager &&
1214

0 commit comments

Comments
 (0)