]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ds/trace2-regions-in-tests'
authorJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:46 +0000 (09:39 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 15 Dec 2021 17:39:46 +0000 (09:39 -0800)
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

1  2 
t/t1092-sparse-checkout-compatibility.sh
t/test-lib.sh

index 0fe5b5f482187fa6a1d39f4343e529db10ebd49e,2de957905b08adf9f306ed0b043555fdf4266e2e..71b45bff4435354e77d0e871ab3f5572ed0cb8d8
@@@ -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
  '
diff --cc t/test-lib.sh
Simple merge