tag: change default of `pager.tag` to "on"

The previous patch taught `git tag` to only respect `pager.tag` in
list-mode. That patch left the default value of `pager.tag` at "off".

After that patch, it makes sense to let the default value be "on"
instead, since it will help with listing many tags, but will not hurt
users of `git tag -a` as it would have before. Make that change. Update
documentation and tests.

Signed-off-by: Martin Ågren <martin.agren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 875d135e0e83d4c41acd647602d948ab636d881f..d97aad3439a9f5a64ca6c808b10906610ac47a94 100644 (file)
--- a/Documentation/git-tag.txt
+++ b/Documentation/git-tag.txt
@@ -206,7 +206,7 @@ it in the repository configuration as follows:
 -------------------------------------
 
 `pager.tag` is only respected when listing tags, i.e., when `-l` is
 -------------------------------------
 
 `pager.tag` is only respected when listing tags, i.e., when `-l` is

-used or implied.
+used or implied. The default is to use a pager.

 See linkgit:git-config[1].
 
 DISCUSSION
 See linkgit:git-config[1].
 
 DISCUSSION

diff --git a/builtin/tag.c b/builtin/tag.c
index 5ad1af2524feb76c5163b21b4a5f9b3f3eb26ba7..ea83df5e13eac3a2f9c71dd187af8b405e742a48 100644 (file)
--- a/builtin/tag.c
+++ b/builtin/tag.c
@@ -462,7 +462,7 @@ int cmd_tag(int argc, const char **argv, const char *prefix)
        }
 
        if (cmdmode == 'l')
        }
 
        if (cmdmode == 'l')

-               setup_auto_pager("tag", 0);
+               setup_auto_pager("tag", 1);

 
        if ((create_tag_object || force) && (cmdmode != 0))
                usage_with_options(git_tag_usage, options);
 
        if ((create_tag_object || force) && (cmdmode != 0))
                usage_with_options(git_tag_usage, options);

diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 570b2f252d4c3b58d5f57db3a55e96776c967d3f..afa03f3b65afd3aea22b967d82a8c4455e7b8808 100755 (executable)
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -134,16 +134,16 @@ test_expect_success TTY 'configuration can enable pager (from subdir)' '
        }
 '
 
        }
 '
 

-test_expect_success TTY 'git tag -l defaults to not paging' '
+test_expect_success TTY 'git tag -l defaults to paging' '

        rm -f paginated.out &&
        test_terminal git tag -l &&
        rm -f paginated.out &&
        test_terminal git tag -l &&

-       ! test -e paginated.out
+       test -e paginated.out

 '
 
 test_expect_success TTY 'git tag -l respects pager.tag' '
        rm -f paginated.out &&
 '
 
 test_expect_success TTY 'git tag -l respects pager.tag' '
        rm -f paginated.out &&

-       test_terminal git -c pager.tag tag -l &&
-       test -e paginated.out
+       test_terminal git -c pager.tag=false tag -l &&
+       ! test -e paginated.out

 '
 
 test_expect_success TTY 'git tag -l respects --no-pager' '
 '
 
 test_expect_success TTY 'git tag -l respects --no-pager' '


@@ -152,32 +152,32 @@ test_expect_success TTY 'git tag -l respects --no-pager' '
        ! test -e paginated.out
 '
 
        ! test -e paginated.out
 '
 

-test_expect_success TTY 'git tag with no args defaults to not paging' '
+test_expect_success TTY 'git tag with no args defaults to paging' '

        # no args implies -l so this should page like -l
        rm -f paginated.out &&
        test_terminal git tag &&
        # no args implies -l so this should page like -l
        rm -f paginated.out &&
        test_terminal git tag &&

-       ! test -e paginated.out
+       test -e paginated.out

 '
 
 test_expect_success TTY 'git tag with no args respects pager.tag' '
        # no args implies -l so this should page like -l
        rm -f paginated.out &&
 '
 
 test_expect_success TTY 'git tag with no args respects pager.tag' '
        # no args implies -l so this should page like -l
        rm -f paginated.out &&

-       test_terminal git -c pager.tag tag &&
-       test -e paginated.out
+       test_terminal git -c pager.tag=false tag &&
+       ! test -e paginated.out

 '
 
 '
 

-test_expect_success TTY 'git tag --contains defaults to not paging' '
+test_expect_success TTY 'git tag --contains defaults to paging' '

        # --contains implies -l so this should page like -l
        rm -f paginated.out &&
        test_terminal git tag --contains &&
        # --contains implies -l so this should page like -l
        rm -f paginated.out &&
        test_terminal git tag --contains &&

-       ! test -e paginated.out
+       test -e paginated.out

 '
 
 test_expect_success TTY 'git tag --contains respects pager.tag' '
        # --contains implies -l so this should page like -l
        rm -f paginated.out &&
 '
 
 test_expect_success TTY 'git tag --contains respects pager.tag' '
        # --contains implies -l so this should page like -l
        rm -f paginated.out &&

-       test_terminal git -c pager.tag tag --contains &&
-       test -e paginated.out
+       test_terminal git -c pager.tag=false tag --contains &&
+       ! test -e paginated.out

 '
 
 test_expect_success TTY 'git tag -a defaults to not paging' '
 '
 
 test_expect_success TTY 'git tag -a defaults to not paging' '


@@ -210,8 +210,8 @@ test_expect_failure TTY 'git tag as alias ignores pager.tag with -a' '
 
 test_expect_success TTY 'git tag as alias respects pager.tag with -l' '
        rm -f paginated.out &&
 
 test_expect_success TTY 'git tag as alias respects pager.tag with -l' '
        rm -f paginated.out &&

-       test_terminal git -c pager.tag -c alias.t=tag t -l &&
-       test -e paginated.out
+       test_terminal git -c pager.tag=false -c alias.t=tag t -l &&
+       ! test -e paginated.out

 '
 
 # A colored commit log will begin with an appropriate ANSI escape
 '
 
 # A colored commit log will begin with an appropriate ANSI escape