Merge branch 'nd/maint-hide-checkout-index-from-error' into maint

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 1890c65fa123e40f956d2c12d6bbe2ecfbcc59d8..fb744e3c4a9a19d9285fc04053044242ffed0c65 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -134,7 +134,15 @@ test_expect_success TTY 'configuration can disable pager' '
        ! test -e paginated.out
 '
 
-test_expect_success 'configuration can enable pager (from subdir)' '
+test_expect_success TTY 'git config uses a pager if configured to' '
+       rm -f paginated.out &&
+       git config pager.config true &&
+       test_when_finished "git config --unset pager.config" &&
+       test_terminal git config --list &&
+       test -e paginated.out
+'
+
+test_expect_success TTY 'configuration can enable pager (from subdir)' '
        rm -f paginated.out &&
        mkdir -p subdir &&
        git config pager.bundle true &&