diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:13 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:13 +0900 |
| commit | 05682ee270199fdfbc11883458b3639b2b1577df (patch) | |
| tree | 471a24735f6e495a46c508390c3c1e28f77b3e01 /t | |
| parent | Merge branch 'sg/t7005-spaces-in-filenames-cleanup' (diff) | |
| parent | column: fix off-by-one default width (diff) | |
| download | tgif-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 't')
| -rwxr-xr-x | t/t7004-tag.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7004-tag.sh b/t/t7004-tag.sh index e3f1e014aa..d7b319e919 100755 --- a/t/t7004-tag.sh +++ b/t/t7004-tag.sh @@ -363,7 +363,7 @@ test_expect_success 'tag -l <pattern> -l <pattern> works, as our buggy documenta ' test_expect_success 'listing tags in column' ' - COLUMNS=40 git tag -l --column=row >actual && + COLUMNS=41 git tag -l --column=row >actual && cat >expected <<\EOF && a1 aa1 cba t210 t211 v0.2.1 v1.0 v1.0.1 v1.1.3 |