Skip to content

Commit 5b2d1c0

Browse files
committed
Merge branch 'jh/trace2-sid-fix'
Polishing of the new trace2 facility continues. The system-level configuration can specify site-wide trace2 settings, which can be overridden with per-user configuration and environment variables. * jh/trace2-sid-fix: trace2: fixup access problem on /etc/gitconfig in read_very_early_config trace2: update docs to describe system/global config settings trace2: make SIDs more unique trace2: clarify UTC datetime formatting trace2: report peak memory usage of the process trace2: use system/global config for default trace2 settings config: add read_very_early_config() trace2: find exec-dir before trace2 initialization trace2: add absolute elapsed time to start event trace2: refactor setting process starting time config: initialize opts structure in repo_read_config()
2 parents 6a6c0f1 + f672dee commit 5b2d1c0

29 files changed

+758
-216
lines changed

Documentation/config.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,8 @@ include::config/submodule.txt[]
422422

423423
include::config/tag.txt[]
424424

425+
include::config/trace2.txt[]
426+
425427
include::config/transfer.txt[]
426428

427429
include::config/uploadarchive.txt[]

Documentation/config/trace2.txt

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
Trace2 config settings are only read from the system and global
2+
config files; repository local and worktree config files and `-c`
3+
command line arguments are not respected.
4+
5+
trace2.normalTarget::
6+
This variable controls the normal target destination.
7+
It may be overridden by the `GIT_TR2` environment variable.
8+
The following table shows possible values.
9+
10+
trace2.perfTarget::
11+
This variable controls the performance target destination.
12+
It may be overridden by the `GIT_TR2_PERF` environment variable.
13+
The following table shows possible values.
14+
15+
trace2.eventTarget::
16+
This variable controls the event target destination.
17+
It may be overridden by the `GIT_TR2_EVENT` environment variable.
18+
The following table shows possible values.
19+
+
20+
include::../trace2-target-values.txt[]
21+
22+
trace2.normalBrief::
23+
Boolean. When true `time`, `filename`, and `line` fields are
24+
omitted from normal output. May be overridden by the
25+
`GIT_TR2_BRIEF` environment variable. Defaults to false.
26+
27+
trace2.perfBrief::
28+
Boolean. When true `time`, `filename`, and `line` fields are
29+
omitted from PERF output. May be overridden by the
30+
`GIT_TR2_PERF_BRIEF` environment variable. Defaults to false.
31+
32+
trace2.eventBrief::
33+
Boolean. When true `time`, `filename`, and `line` fields are
34+
omitted from event output. May be overridden by the
35+
`GIT_TR2_EVENT_BRIEF` environment variable. Defaults to false.
36+
37+
trace2.eventNesting::
38+
Integer. Specifies desired depth of nested regions in the
39+
event output. Regions deeper than this value will be
40+
omitted. May be overridden by the `GIT_TR2_EVENT_NESTING`
41+
environment variable. Defaults to 2.
42+
43+
trace2.configParams::
44+
A comma-separated list of patterns of "important" config
45+
settings that should be recorded in the trace2 output.
46+
For example, `core.*,remote.*.url` would cause the trace2
47+
output to contain events listing each configured remote.
48+
May be overridden by the `GIT_TR2_CONFIG_PARAMS` environment
49+
variable. Unset by default.
50+
51+
trace2.destinationDebug::
52+
Boolean. When true Git will print error messages when a
53+
trace target destination cannot be opened for writing.
54+
By default, these errors are suppressed and tracing is
55+
silently disabled. May be overridden by the
56+
`GIT_TR2_DST_DEBUG` environment variable.

0 commit comments

Comments
 (0)