Merge branch 'jk/sort-iter-test-output'

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 00e09a375c2e6e3bfce2c2f8ce93493513082b2d..7976fa7bcce8ed11c403a4923d9ce3e7155765a0 100755 (executable)
--- 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 &&