kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

test-lib.sh: set COLUMNS=80 for --verbose repeatability 

Some tests will fail under --verbose because while we've unset COLUMNS
since b1d645b58a (tests: unset COLUMNS inherited from environment,
2012-03-27), we also look for the columns with an ioctl(..,
TIOCGWINSZ, ...) on some platforms. By setting COLUMNS again we
preempt the TIOCGWINSZ lookup in pager.c's term_columns(), it'll take
COLUMNS over TIOCGWINSZ,

This fixes t0500-progress-display.sh., which broke because of a
combination of the this issue and the progress output reacting to the
column width since 545dc345eb (progress: break too long progress bar
lines, 2019-04-12). The t5324-split-commit-graph.sh fails in a similar
manner due to progress output, see [1] for details.

The issue is not specific to progress.c, the diff code also checks
COLUMNS and some of its tests can be made to fail in a similar
manner[2], anything that invokes a pager is potentially affected.

See ea77e675e5 (Make "git help" react to window size correctly,
2005-12-18) and ad6c3739a3 (pager: find out the terminal width before
spawning the pager, 2012-02-12) for how the TIOCGWINSZ code ended up
in pager.c

1. http://lore.kernel.org/git/20210624051253.GG6312@szeder.dev
2. https://lore.kernel.org/git/20210627074419.GH6312@szeder.dev/

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
maint
Ævar Arnfjörð Bjarmason 2021-06-29 13:29:36 +02:00 committed by Junio C Hamano
parent ebf3c04b26
commit c49a177bec
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
t/test-lib.sh
View File

@ -401,14 +401,15 @@ LANG=C
LC_ALL=C LC_ALL=C
PAGER=cat PAGER=cat
TZ=UTC TZ=UTC
export LANG LC_ALL PAGER TZ COLUMNS=80
export LANG LC_ALL PAGER TZ COLUMNS
EDITOR=: EDITOR=:


# A call to "unset" with no arguments causes at least Solaris 10 # A call to "unset" with no arguments causes at least Solaris 10
# /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets # /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets
# deriving from the command substitution clustered with the other # deriving from the command substitution clustered with the other
# ones. # ones.
unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
my @env = keys %ENV; my @env = keys %ENV;
my $ok = join("|", qw( my $ok = join("|", qw(
TRACE TRACE