send-email: Refuse to send cover-letter template subject

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 9215c2ff56e16a3a4f455e6137bdcb29d8651a2b..71d3ceff8f06ad33aee5e48f85e97164df447a59 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -3,6 +3,7 @@
 test_description='Test automatic use of a pager.'
 
 . ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-pager.sh
 
 cleanup_fail() {
        echo >&2 cleanup failed
@@ -36,7 +37,7 @@ then
        }
        test_set_prereq TTY
 else
-       say no usable terminal, so skipping some tests
+       say "# no usable terminal, so skipping some tests"
 fi
 
 test_expect_success 'setup' '
@@ -158,18 +159,9 @@ test_expect_success 'color when writing to a file intended for a pager' '
        colorful colorful.log
 '
 
-test_expect_success 'determine default pager' '
-       unset PAGER GIT_PAGER;
-       test_might_fail git config --unset core.pager ||
-       cleanup_fail &&
-
-       less=$(git var GIT_PAGER) &&
-       test -n "$less"
-'
-
-if expr "$less" : '[a-z][a-z]*$' >/dev/null && test_have_prereq TTY
+if test_have_prereq SIMPLEPAGER && test_have_prereq TTY
 then
-       test_set_prereq SIMPLEPAGER
+       test_set_prereq SIMPLEPAGERTTY
 fi
 
 # Use this helper to make it easy for the caller of your
@@ -207,7 +199,7 @@ parse_args() {
 test_default_pager() {
        parse_args "$@"
 
-       $test_expectation SIMPLEPAGER "$cmd - default pager is used by default" "
+       $test_expectation SIMPLEPAGERTTY "$cmd - default pager is used by default" "
                unset PAGER GIT_PAGER;
                test_might_fail git config --unset core.pager &&
                rm -f default_pager_used ||