summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorLibravatar Martin Ågren <martin.agren@gmail.com>2017-11-19 16:03:50 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-11-20 09:50:25 +0900
commit0ae19de74f6f5d6c6f9c80899e1ecd611c5b9827 (patch)
treee769eb86928cc201ad2cc5c116f14ec8398228ff /t
parentbranch: respect `pager.branch` in list-mode only (diff)
downloadtgif-0ae19de74f6f5d6c6f9c80899e1ecd611c5b9827.tar.xz
branch: change default of `pager.branch` to "on"
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.branch` at all when we are not listing branches. This change will help with listing many branches, but will not hurt users of `git branch --edit-description` as it would have before the previous commit. Signed-off-by: Martin Ågren <martin.agren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
-rwxr-xr-xt/t7006-pager.sh10
1 files changed, 5 insertions, 5 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh
index 5998f7135b..f59dfd1432 100755
--- a/t/t7006-pager.sh
+++ b/t/t7006-pager.sh
@@ -214,21 +214,21 @@ test_expect_success TTY 'git tag as alias respects pager.tag with -l' '
! test -e paginated.out
'
-test_expect_success TTY 'git branch defaults to not paging' '
+test_expect_success TTY 'git branch defaults to paging' '
rm -f paginated.out &&
test_terminal git branch &&
- ! test -e paginated.out
+ test -e paginated.out
'
test_expect_success TTY 'git branch respects pager.branch' '
rm -f paginated.out &&
- test_terminal git -c pager.branch branch &&
- test -e paginated.out
+ test_terminal git -c pager.branch=false branch &&
+ ! test -e paginated.out
'
test_expect_success TTY 'git branch respects --no-pager' '
rm -f paginated.out &&
- test_terminal git -c pager.branch --no-pager branch &&
+ test_terminal git --no-pager branch &&
! test -e paginated.out
'