From: Kevin Daudt <me@ikke.info>
To: git@vger.kernel.org
Cc: pclouds@gmail.com, Kevin Daudt <me@ikke.info>
Subject: [RFC] column: show auto columns when pager is active
Date: Mon, 9 Oct 2017 23:45:43 +0200 [thread overview]
Message-ID: <20171009214543.12986-1-me@ikke.info> (raw)
When columns are set to automatic for git tag and the output is
paginated by git, the output is a single column instead of multiple
columns.
Standard behaviour in git is to honor auto values when the pager is
active, which happens for example with commands like git log showing
colors when being paged.
Since ff1e72483 (tag: change default of `pager.tag` to "on",
2017-08-02), the pager has been enabled by default, exposing this
problem to more people.
finalize_colopts in column.c only checks whether the output is a TTY to
determine if columns should be enabled with columns set to autol. Also check
if the pager is active.
Helped-by: Rafael Ascensão <rafa.almas@gmail.com>
Signed-off-by: Kevin Daudt <me@ikke.info>
---
This came to light when someone wondered on irc why
column.tag=[auto|always] did not work on Mac OS. Testing it myself, I
found it to work with always, but not with auto.
I could not get the test to work yet, because somehow it's not giving
any output, so feedback regarding that is welcome.
column.c | 3 ++-
t/t9002-column.sh | 13 +++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/column.c b/column.c
index ff7bdab1a..ded50337f 100644
--- a/column.c
+++ b/column.c
@@ -5,6 +5,7 @@
#include "parse-options.h"
#include "run-command.h"
#include "utf8.h"
+#include "pager.c"
#define XY2LINEAR(d, x, y) (COL_LAYOUT((d)->colopts) == COL_COLUMN ? \
(x) * (d)->rows + (y) : \
@@ -224,7 +225,7 @@ int finalize_colopts(unsigned int *colopts, int stdout_is_tty)
if (stdout_is_tty < 0)
stdout_is_tty = isatty(1);
*colopts &= ~COL_ENABLE_MASK;
- if (stdout_is_tty)
+ if (stdout_is_tty || pager_in_use())
*colopts |= COL_ENABLED;
}
return 0;
diff --git a/t/t9002-column.sh b/t/t9002-column.sh
index 89983527b..9441145bf 100755
--- a/t/t9002-column.sh
+++ b/t/t9002-column.sh
@@ -2,6 +2,7 @@
test_description='git column'
. ./test-lib.sh
+. "$TEST_DIRECTORY"/lib-terminal.sh
test_expect_success 'setup' '
cat >lista <<\EOF
@@ -177,4 +178,16 @@ EOF
test_cmp expected actual
'
+test_expect_success TTY '20 columns, mode auto, pager' '
+ cat >expected <<\EOF &&
+one seven
+two eight
+three nine
+four ten
+five eleven
+six
+EOF
+ test_terminal env PAGER="cat|cat" git column --mode=auto <lista >actual &&
+ test_cmp expected actual
+'
test_done
--
2.14.2
next reply other threads:[~2017-10-09 21:46 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-09 21:45 Kevin Daudt [this message]
2017-10-09 23:27 ` [RFC] column: show auto columns when pager is active Eric Sunshine
2017-10-10 10:30 ` Martin Ågren
2017-10-10 14:01 ` Jeff King
2017-10-10 17:02 ` Martin Ågren
2017-10-11 4:54 ` Kevin Daudt
2017-10-12 14:24 ` Jeff King
2017-10-10 14:10 ` Jeff King
2017-10-10 14:29 ` Jeff King
2017-10-10 17:04 ` Martin Ågren
2017-10-10 18:32 ` Kevin Daudt
2017-10-11 17:23 ` [PATCH] " Kevin Daudt
2017-10-11 18:12 ` Martin Ågren
2017-10-11 18:36 ` Kevin Daudt
2017-10-11 19:02 ` Martin Ågren
2017-10-16 18:35 ` [PATCH v2] " Kevin Daudt
2017-10-17 3:19 ` Junio C Hamano
2017-10-23 21:52 ` Jonathan Nieder
2017-10-24 1:11 ` Junio C Hamano
2017-10-24 1:18 ` Jonathan Nieder
2017-10-24 6:58 ` Kevin Daudt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171009214543.12986-1-me@ikke.info \
--to=me@ikke.info \
--cc=git@vger.kernel.org \
--cc=pclouds@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).