aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Felipe Contreras <felipe.contreras@gmail.com> 2021-08-05 14:48:25 -0500
committerGravatar Junio C Hamano <gitster@pobox.com> 2021-08-06 09:59:55 -0700
commit390b44eb2bca5195d524629bccc98d8bbee74410 (patch)
tree2bed361b28678b61d35e3e6bbf571e1919688a05
parentc49a177beca2f03f205437a3fa8c52e2011bd581 (diff)
downloadgit-390b44eb2bca5195d524629bccc98d8bbee74410.tar.gz
git-390b44eb2bca5195d524629bccc98d8bbee74410.zip
test: fix for COLUMNS and bash 5
Since c49a177bec (test-lib.sh: set COLUMNS=80 for --verbose repeatability, 2021-06-29) multiple tests have been failing when using bash 5 because checkwinsize is enabled by default, therefore COLUMNS is reset using TIOCGWINSZ even for non-interactive shells. It's debatable whether or not bash should even be doing that, but for now we can avoid this undesirable behavior by disabling this option. Reported-by: Fabian Stelzer <fabian.stelzer@campoint.net> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com> [jc: with SZEDER Gábor's suggestion to do this before setting COLUMNS] Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/test-lib.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 4d4439a917..52701afaea 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -395,6 +395,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