[PATCH 3/3] config: change default of `pager.config` to "on"
- From
- Martin Ågren <martin.agren@gmail.com>
- Date
- Feb 11, 2018, 16:40 UTC
- Message-ID
- <cb4440e4f910f7095f16144afcc5963445211482.1518365675.git.martin.agren@gmail.com>
- In-Reply-To
- <450ff45707b58d6796d55cd594b50686e5d62fc2.1518365675.git.martin.agren@gmail.com>
This is similar to ff1e72483 (tag: change default of `pager.tag` to "on", 2017-08-02) and is safe now that we do not consider `pager.config` at all when we are not listing or getting configuration. This change will help with listing large configurations, but will not hurt users of `git config --edit` as it would have before the previous commit.
Signed-off-by: Martin Ågren <martin.agren@gmail.com> --- Documentation/git-config.txt | 2 +- t/t7006-pager.sh | 12 ++++++------ builtin/config.c | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index ccc8f0bcff..78074cf3b2 100644 --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -236,7 +236,7 @@ See also <<FILES>>. CONFIGURATION ------------- `pager.config` is only respected when listing configuration, i.e., when -`--list`, `--get` or any of `--get-*` is used. +`--list`, `--get` or any of `--get-*` is used. The default is to use a pager. [[FILES]] FILES diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index 869a0359a8..47f7830eb1 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -261,22 +261,22 @@ test_expect_success TTY 'git config --edit ignores pager.config' ' test -e editor.used ' -test_expect_success TTY 'git config --get defaults to not paging' ' +test_expect_success TTY 'git config --get defaults to paging' ' rm -f paginated.out && test_terminal git config --get foo.bar && - ! test -e paginated.out + test -e paginated.out ' test_expect_success TTY 'git config --get respects pager.config' ' rm -f paginated.out && - test_terminal git -c pager.config config --get foo.bar && - test -e paginated.out + test_terminal git -c pager.config=false config --get foo.bar && + ! test -e paginated.out ' -test_expect_success TTY 'git config --list defaults to not paging' ' +test_expect_success TTY 'git config --list defaults to paging' ' rm -f paginated.out && test_terminal git config --list && - ! test -e paginated.out + test -e paginated.out ' diff --git a/builtin/config.c b/builtin/config.c index 9a57a0caff..61808a93cb 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -600,7 +600,7 @@ int cmd_config(int argc, const char **argv, const char *prefix) } if (actions & ACTION_LIST_OR_GET) - setup_auto_pager("config", 0); + setup_auto_pager("config", 1); if (actions == ACTION_LIST) { check_argc(argc, 0, 0);
-- 2.16.1.72.g5be1f00a9a