diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:50 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-11-15 12:04:50 +0900 |
| commit | e18b1df299a82c8edc262091dc0b77b1f13c5f0b (patch) | |
| tree | e3b523923d3905c58cf649d6027fc5544518fded /t | |
| parent | 2cd4e031216401d495465b7eb3c19038965df4af (diff) | |
| parent | 965ff23a4395fb9c09133a48244b1cd2f70e88e9 (diff) | |
| download | git-e18b1df299a82c8edc262091dc0b77b1f13c5f0b.tar.gz git-e18b1df299a82c8edc262091dc0b77b1f13c5f0b.tar.xz | |
Merge branch 'kd/auto-col-with-pager-fix' into maint
"auto" as a value for the columnar output configuration ought to
judge "is the output consumed by humans?" with the same criteria as
"auto" for coloured output configuration, i.e. either the standard
output stream is going to tty, or a pager is in use. We forgot the
latter, which has been fixed.
* kd/auto-col-with-pager-fix:
column: do not include pager.c
column: show auto columns when pager is active
Diffstat (limited to 't')
| -rwxr-xr-x | t/t7006-pager.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7006-pager.sh b/t/t7006-pager.sh index f0f1abd1c..865168ec6 100755 --- a/t/t7006-pager.sh +++ b/t/t7006-pager.sh @@ -570,4 +570,18 @@ test_expect_success 'command with underscores does not complain' ' test_cmp expect actual ' +test_expect_success TTY 'git tag with auto-columns ' ' + test_commit one && + test_commit two && + test_commit three && + test_commit four && + test_commit five && + cat >expect <<-\EOF && + initial one two three four five + EOF + test_terminal env PAGER="cat >actual" COLUMNS=80 \ + git -c column.ui=auto tag --sort=authordate && + test_cmp expect actual +' + test_done |