From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:36 +0000 (-0700)
Subject: Merge branch 'sg/trace2-rename'
X-Git-Tag: v2.23.0-rc0~87
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e9eaaa46906753ca8958df33328a0590b0287166?hp=-c

Merge branch 'sg/trace2-rename'

Dev support update to help tracing out tests.

* sg/trace2-rename:
trace2: correct typo in technical documentation
Revert "test-lib: whitelist GIT_TR2_* in the environment"
---

e9eaaa46906753ca8958df33328a0590b0287166
diff --combined t/test-lib.sh
index 4b346467df,57f7c30377..d1ba33745a
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -386,7 -386,6 +386,6 @@@ unset VISUAL EMAIL LANGUAGE COLUMNS $("
  	my @env = keys %ENV;
  	my $ok = join("|", qw(
  		TRACE
- 		TR2_
  		DEBUG
  		TEST
  		.*_TEST
@@@ -1607,7 -1606,3 +1606,7 @@@ test_lazy_prereq SHA1 
  test_lazy_prereq REBASE_P '
  	test -z "$GIT_TEST_SKIP_REBASE_P"
  '
 +
 +test_lazy_prereq FAIL_PREREQS '
 +	test -n "$GIT_TEST_FAIL_PREREQS"
 +'