diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2021-08-06 12:50:26 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-08-06 12:50:26 -0700 |
| commit | c87977a0c58c67dea22e1cb50e429e2122b037b9 (patch) | |
| tree | 3b3ea7750c64bbcc96297ec922fe51c4bf7a36a4 | |
| parent | The eighth batch (diff) | |
| parent | test: fix for COLUMNS and bash 5 (diff) | |
| download | tgif-c87977a0c58c67dea22e1cb50e429e2122b037b9.tar.xz | |
Merge branch 'fc/disable-checkwinsize'
* fc/disable-checkwinsize:
test: fix for COLUMNS and bash 5
| -rw-r--r-- | t/test-lib.sh | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index db61081d6b..abcfbed6d6 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -409,6 +409,12 @@ then verbose=t fi +# Since bash 5.0, checkwinsize is enabled by default which does +# update the COLUMNS variable every time a non-builtin command +# completes, even for non-interactive shells. +# Disable that since we are aiming for repeatability. +test -n "$BASH_VERSION" && shopt -u checkwinsize 2>/dev/null + # For repeatability, reset the environment to known value. # TERM is sanitized below, after saving color control sequences. LANG=C |