From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Dec 2021 17:39:46 +0000 (-0800)
Subject: Merge branch 'ds/trace2-regions-in-tests'
X-Git-Tag: v2.35.0-rc0~87
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=62329d336f5d427d8f08035798bf62cd7d8fd847;p=thirdparty%2Fgit.git

Merge branch 'ds/trace2-regions-in-tests'

The default setting for trace2 event nesting was too low to cause
test failures, which is worked around by bumping it up in the test
framework.

* ds/trace2-regions-in-tests:
  t/t*: remove custom GIT_TRACE2_EVENT_NESTING
  test-lib.sh: set GIT_TRACE2_EVENT_NESTING
---

62329d336f5d427d8f08035798bf62cd7d8fd847
diff --cc t/t1092-sparse-checkout-compatibility.sh
index 0fe5b5f482,2de957905b..71b45bff44
--- a/t/t1092-sparse-checkout-compatibility.sh
+++ b/t/t1092-sparse-checkout-compatibility.sh
@@@ -784,8 -688,8 +784,8 @@@ test_expect_success 'submodule handling
  test_expect_success 'sparse-index is expanded and converted back' '
  	init_repos &&
  
- 	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" GIT_TRACE2_EVENT_NESTING=10 \
+ 	GIT_TRACE2_EVENT="$(pwd)/trace2.txt" \
 -		git -C sparse-index -c core.fsmonitor="" reset --hard &&
 +		git -C sparse-index reset -- folder1/a &&
  	test_region index convert_to_sparse trace2.txt &&
  	test_region index ensure_full_index trace2.txt
  '