Merge branch 'km/avoid-non-function-return-in-rebase' into maint

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 7fe3367b6b6b8f4373dfdb9ffc956f8e1670801a..b9365b431d1e412905ddd0efad1f809625224ba9 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -40,7 +40,7 @@ test_expect_failure TTY 'pager runs from subdir' '
 test_expect_success TTY 'LESS and LV envvars are set for pagination' '
        (
                sane_unset LESS LV &&
-               PAGER="env >pager-env.out" &&
+               PAGER="env >pager-env.out; wc" &&
                export PAGER &&
 
                test_terminal git log