summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:13 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-05-23 14:38:13 +0900
commit05682ee270199fdfbc11883458b3639b2b1577df (patch)
tree471a24735f6e495a46c508390c3c1e28f77b3e01 /builtin
parentMerge branch 'sg/t7005-spaces-in-filenames-cleanup' (diff)
parentcolumn: fix off-by-one default width (diff)
downloadtgif-05682ee270199fdfbc11883458b3639b2b1577df.tar.xz
Merge branch 'nd/term-columns'
The code did not propagate the terminal width to subprocesses via COLUMNS environment variable, which it now does. This caused trouble to "git column" helper subprocess when "git tag --column=row" tried to list the existing tags on a display with non-default width. * nd/term-columns: column: fix off-by-one default width pager: set COLUMNS to term_columns()
Diffstat (limited to 'builtin')
-rw-r--r--builtin/column.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/column.c b/builtin/column.c
index 0c3223d64b..5228ccf37a 100644
--- a/builtin/column.c
+++ b/builtin/column.c
@@ -42,7 +42,6 @@ int cmd_column(int argc, const char **argv, const char *prefix)
git_config(column_config, NULL);
memset(&copts, 0, sizeof(copts));
- copts.width = term_columns();
copts.padding = 1;
argc = parse_options(argc, argv, "", options, builtin_column_usage, 0);
if (argc)