summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:31 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-05-13 14:50:31 (GMT)
commit5b2d1c0c6eceb5fd6c9527bc2863179644dce840 (patch)
tree157db719b486e9bdd971efc9aa15fca4e77a3681 /Makefile
parent6a6c0f10a70a6eb101c213b09ae82a9cad252743 (diff)
parentf672deec2d56b0d7ae64ce3efd918e02efc58b9c (diff)
downloadgit-5b2d1c0c6eceb5fd6c9527bc2863179644dce840.zip
git-5b2d1c0c6eceb5fd6c9527bc2863179644dce840.tar.gz
git-5b2d1c0c6eceb5fd6c9527bc2863179644dce840.tar.bz2
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()
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 5143cab..af24787 100644
--- a/Makefile
+++ b/Makefile
@@ -999,6 +999,7 @@ LIB_OBJS += trace2/tr2_cfg.o
LIB_OBJS += trace2/tr2_cmd_name.o
LIB_OBJS += trace2/tr2_dst.o
LIB_OBJS += trace2/tr2_sid.o
+LIB_OBJS += trace2/tr2_sysenv.o
LIB_OBJS += trace2/tr2_tbuf.o
LIB_OBJS += trace2/tr2_tgt_event.o
LIB_OBJS += trace2/tr2_tgt_normal.o