diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-07-09 15:25:36 -0700 |
| commit | e9eaaa46906753ca8958df33328a0590b0287166 (patch) | |
| tree | 26bdbda6469caf47436d65af49054251de7206ca | |
| parent | Merge branch 'nd/completion-no-cache-failure' (diff) | |
| parent | trace2: correct typo in technical documentation (diff) | |
| download | git-e9eaaa46906753ca8958df33328a0590b0287166.tar.gz git-e9eaaa46906753ca8958df33328a0590b0287166.zip | |
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"
| -rw-r--r-- | Documentation/technical/api-trace2.txt | 2 | ||||
| -rw-r--r-- | t/test-lib.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/technical/api-trace2.txt b/Documentation/technical/api-trace2.txt index 23c3cc7a37..f7ffe7d599 100644 --- a/Documentation/technical/api-trace2.txt +++ b/Documentation/technical/api-trace2.txt @@ -35,7 +35,7 @@ Format details are given in a later section. === The Normal Format Target The normal format target is a tradition printf format and similar -to GIT_TRACE format. This format is enabled with the `GIT_TR` +to GIT_TRACE format. This format is enabled with the `GIT_TRACE2` environment variable or the `trace2.normalTarget` system or global config setting. diff --git a/t/test-lib.sh b/t/test-lib.sh index 4b346467df..d1ba33745a 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -386,7 +386,6 @@ unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e ' my @env = keys %ENV; my $ok = join("|", qw( TRACE - TR2_ DEBUG TEST .*_TEST |