Merge branch 'jk/color-and-pager'

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 5641b595596ea462ec649c531e7173709a012274..458233693bde83ddbd5c9264cf8f9d31401668bb 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -12,8 +12,8 @@ cleanup_fail() {
 }
 
 test_expect_success 'setup' '
-       unset GIT_PAGER GIT_PAGER_IN_USE;
-       test_might_fail git config --unset core.pager &&
+       sane_unset GIT_PAGER GIT_PAGER_IN_USE &&
+       test_unconfig core.pager &&
 
        PAGER="cat >paginated.out" &&
        export PAGER &&
@@ -94,21 +94,19 @@ test_expect_success TTY 'no pager with --no-pager' '
 
 test_expect_success TTY 'configuration can disable pager' '
        rm -f paginated.out &&
-       test_might_fail git config --unset pager.grep &&
+       test_unconfig pager.grep &&
        test_terminal git grep initial &&
        test -e paginated.out &&
 
        rm -f paginated.out &&
-       git config pager.grep false &&
-       test_when_finished "git config --unset pager.grep" &&
+       test_config pager.grep false &&
        test_terminal git grep initial &&
        ! test -e paginated.out
 '
 
 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_config pager.config true &&
        test_terminal git config --list &&
        test -e paginated.out
 '
@@ -116,8 +114,7 @@ test_expect_success TTY 'git config uses a pager if configured to' '
 test_expect_success TTY 'configuration can enable pager (from subdir)' '
        rm -f paginated.out &&
        mkdir -p subdir &&
-       git config pager.bundle true &&
-       test_when_finished "git config --unset pager.bundle" &&
+       test_config pager.bundle true &&
 
        git bundle create test.bundle --all &&
        rm -f paginated.out subdir/paginated.out &&
@@ -150,7 +147,7 @@ test_expect_success 'tests can detect color' '
 
 test_expect_success 'no color when stdout is a regular file' '
        rm -f colorless.log &&
-       git config color.ui auto ||
+       test_config color.ui auto ||
        cleanup_fail &&
 
        git log >colorless.log &&
@@ -159,7 +156,7 @@ test_expect_success 'no color when stdout is a regular file' '
 
 test_expect_success TTY 'color when writing to a pager' '
        rm -f paginated.out &&
-       git config color.ui auto ||
+       test_config color.ui auto ||
        cleanup_fail &&
 
        (
@@ -170,9 +167,21 @@ test_expect_success TTY 'color when writing to a pager' '
        colorful paginated.out
 '
 
+test_expect_success TTY 'colors are suppressed by color.pager' '
+       rm -f paginated.out &&
+       test_config color.ui auto &&
+       test_config color.pager false &&
+       (
+               TERM=vt100 &&
+               export TERM &&
+               test_terminal git log
+       ) &&
+       ! colorful paginated.out
+'
+
 test_expect_success 'color when writing to a file intended for a pager' '
        rm -f colorful.log &&
-       git config color.ui auto ||
+       test_config color.ui auto ||
        cleanup_fail &&
 
        (
@@ -184,6 +193,17 @@ test_expect_success 'color when writing to a file intended for a pager' '
        colorful colorful.log
 '
 
+test_expect_success TTY 'colors are sent to pager for external commands' '
+       test_config alias.externallog "!git log" &&
+       test_config color.ui auto &&
+       (
+               TERM=vt100 &&
+               export TERM &&
+               test_terminal git -p externallog
+       ) &&
+       colorful paginated.out
+'
+
 # Use this helper to make it easy for the caller of your
 # terminal-using function to specify whether it should fail.
 # If you write
@@ -220,8 +240,8 @@ test_default_pager() {
        parse_args "$@"
 
        $test_expectation SIMPLEPAGER,TTY "$cmd - default pager is used by default" "
-               unset PAGER GIT_PAGER;
-               test_might_fail git config --unset core.pager &&
+               sane_unset PAGER GIT_PAGER &&
+               test_unconfig core.pager &&
                rm -f default_pager_used ||
                cleanup_fail &&
 
@@ -243,8 +263,8 @@ test_PAGER_overrides() {
        parse_args "$@"
 
        $test_expectation TTY "$cmd - PAGER overrides default pager" "
-               unset GIT_PAGER;
-               test_might_fail git config --unset core.pager &&
+               sane_unset GIT_PAGER &&
+               test_unconfig core.pager &&
                rm -f PAGER_used ||
                cleanup_fail &&
 
@@ -271,13 +291,13 @@ test_core_pager() {
        parse_args "$@"
 
        $test_expectation TTY "$cmd - repository-local core.pager setting $used_if_wanted" "
-               unset GIT_PAGER;
+               sane_unset GIT_PAGER &&
                rm -f core.pager_used ||
                cleanup_fail &&
 
                PAGER=wc &&
                export PAGER &&
-               git config core.pager 'wc >core.pager_used' &&
+               test_config core.pager 'wc >core.pager_used' &&
                $full_command &&
                ${if_local_config}test -e core.pager_used
        "
@@ -299,7 +319,7 @@ test_pager_subdir_helper() {
        parse_args "$@"
 
        $test_expectation TTY "$cmd - core.pager $used_if_wanted from subdirectory" "
-               unset GIT_PAGER;
+               sane_unset GIT_PAGER &&
                rm -f core.pager_used &&
                rm -fr sub ||
                cleanup_fail &&
@@ -307,7 +327,7 @@ test_pager_subdir_helper() {
                PAGER=wc &&
                stampname=\$(pwd)/core.pager_used &&
                export PAGER stampname &&
-               git config core.pager 'wc >\"\$stampname\"' &&
+               test_config core.pager 'wc >\"\$stampname\"' &&
                mkdir sub &&
                (
                        cd sub &&
@@ -324,7 +344,7 @@ test_GIT_PAGER_overrides() {
                rm -f GIT_PAGER_used ||
                cleanup_fail &&
 
-               git config core.pager wc &&
+               test_config core.pager wc &&
                GIT_PAGER='wc >GIT_PAGER_used' &&
                export GIT_PAGER &&
                $full_command &&
@@ -401,4 +421,33 @@ test_core_pager_subdir    expect_success 'git -p shortlog'
 test_core_pager_subdir    expect_success test_must_fail \
                                         'git -p apply </dev/null'
 
+test_expect_success TTY 'command-specific pager' '
+       sane_unset PAGER GIT_PAGER &&
+       echo "foo:initial" >expect &&
+       >actual &&
+       test_unconfig core.pager &&
+       test_config pager.log "sed s/^/foo:/ >actual" &&
+       test_terminal git log --format=%s -1 &&
+       test_cmp expect actual
+'
+
+test_expect_success TTY 'command-specific pager overrides core.pager' '
+       sane_unset PAGER GIT_PAGER &&
+       echo "foo:initial" >expect &&
+       >actual &&
+       test_config core.pager "exit 1"
+       test_config pager.log "sed s/^/foo:/ >actual" &&
+       test_terminal git log --format=%s -1 &&
+       test_cmp expect actual
+'
+
+test_expect_success TTY 'command-specific pager overridden by environment' '
+       GIT_PAGER="sed s/^/foo:/ >actual" && export GIT_PAGER &&
+       >actual &&
+       echo "foo:initial" >expect &&
+       test_config pager.log "exit 1" &&
+       test_terminal git log --format=%s -1 &&
+       test_cmp expect actual
+'
+
 test_done