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.ag...@gmail.com>
---
Documentation/git-tag.txt | 2 +-
t/t7006-pager.sh | 28 ++++++++++++++--------------
builtin/tag.c | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Documentation/git-tag.txt b/Documentation/git-tag.txt
index 875d135e0..d97aad343 100644
--- 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
-used or implied.
+used or implied. The default is to use a pager.
See linkgit:git-config[1].
DISCUSSION
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 570b2f252..afa03f3b6 100755
--- 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 &&
- ! test -e paginated.out
+ test -e 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' '
@@ -152,32 +152,32 @@ test_expect_success TTY 'git tag -l respects --no-pager' '
! 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 &&
- ! 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_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 &&
- ! 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_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' '
@@ -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_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
diff --git a/builtin/tag.c b/builtin/tag.c
index 5ad1af252..ea83df5e1 100644
--- 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')
- setup_auto_pager("tag", 0);
+ setup_auto_pager("tag", 1);
if ((create_tag_object || force) && (cmdmode != 0))
usage_with_options(git_tag_usage, options);
--
2.14.0.rc1.12.ge2d9c4613
