From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 23 Apr 2026 02:08:25 +0000 (+0900)
Subject: Merge branch 'ps/test-set-e-clean' into next
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4f69b47b940100b02630f745a52f9d9850f122b2;p=thirdparty%2Fgit.git

Merge branch 'ps/test-set-e-clean' into next

The test suite harness and many individual test scripts have been
updated to work correctly when 'set -e' is in effect, which helps
detect misspelled test commands.

* ps/test-set-e-clean:
  t: detect errors outside of test cases
  t9902: fix use of `read` with `set -e`
  t6002: fix use of `expr` with `set -e`
  t1301: don't fail in case setfacl(1) doesn't exist or fails
  t0008: silence error in subshell when using `grep -v`
  t: prepare `test_when_finished ()`/`test_atexit()` for `set -e`
  t: prepare execution of potentially failing commands for `set -e`
  t: prepare conditional test execution for `set -e`
  t: prepare `git config --unset` calls for `set -e`
  t: prepare `stop_git_daemon ()` for `set -e`
  t: prepare `test_must_fail ()` for `set -e`
  t: prepare `test_match_signal ()` calls for `set -e`
---

4f69b47b940100b02630f745a52f9d9850f122b2
diff --cc ci/run-build-and-tests.sh
index e2d783d90b,de08a08d59..1d9a0a736d
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@@@ -8,12 -8,17 +8,19 @@@
  export TEST_CONTRIB_TOO=yes
  
  case "$jobname" in
 +linux-musl-meson)
 +	MESONFLAGS="$MESONFLAGS -Drust=disabled"
++	export GIT_TEST_USE_SET_E=yes
 +	;;
+ almalinux-*|debian-*|fedora-*|linux-*)
+ 	export GIT_TEST_USE_SET_E=yes
+ 	;;
+ esac
+ 
+ case "$jobname" in
  fedora-breaking-changes-musl|linux-breaking-changes)
  	export WITH_BREAKING_CHANGES=YesPlease
 -	export WITH_RUST=YesPlease
  	MESONFLAGS="$MESONFLAGS -Dbreaking_changes=true"
 -	MESONFLAGS="$MESONFLAGS -Drust=enabled"
  	;;
  linux-TEST-vars)
  	export OPENSSL_SHA1_UNSAFE=YesPlease