summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2018-05-11 09:25:16 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-05-13 01:45:03 (GMT)
commitbe11f7ad60fb9e114891db993830e57fef9989ea (patch)
tree06c9b3f5f313ce2a6deaca845d6a314c453ca4d5
parent468165c1d8a442994a825f3684528361727cd8c0 (diff)
downloadgit-be11f7ad60fb9e114891db993830e57fef9989ea.zip
git-be11f7ad60fb9e114891db993830e57fef9989ea.tar.gz
git-be11f7ad60fb9e114891db993830e57fef9989ea.tar.bz2
pager: set COLUMNS to term_columns()
After we invoke the pager, our stdout goes to a pipe, not the terminal, meaning we can no longer use an ioctl to get the terminal width. For that reason, ad6c3739a3 (pager: find out the terminal width before spawning the pager, 2012-02-12) started caching the terminal width. But that cache is only an in-process variable. Any programs we spawn will also not be able to run that ioctl, but won't have access to our cache. They'll end up falling back to our 80-column default. You can see the problem with: git tag --column=row Since git-tag spawns a pager these days, its spawned git-column helper will see neither the terminal on stdout nor a useful COLUMNS value (assuming you do not export it from your shell already). And you'll end up with 80-column output in the pager, regardless of your terminal size. We can fix this by setting COLUMNS right before spawning the pager. That fixes this case, as well as any more complicated ones (e.g., a paged program spawns another script which then generates columnized output). Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--pager.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/pager.c b/pager.c
index 92b23e6..226828f 100644
--- a/pager.c
+++ b/pager.c
@@ -109,10 +109,15 @@ void setup_pager(void)
return;
/*
- * force computing the width of the terminal before we redirect
- * the standard output to the pager.
+ * After we redirect standard output, we won't be able to use an ioctl
+ * to get the terminal size. Let's grab it now, and then set $COLUMNS
+ * to communicate it to any sub-processes.
*/
- (void) term_columns();
+ {
+ char buf[64];
+ xsnprintf(buf, sizeof(buf), "%d", term_columns());
+ setenv("COLUMNS", buf, 0);
+ }
setenv("GIT_PAGER_IN_USE", "true", 1);