aboutsummaryrefslogtreecommitdiffstats
path: root/trace2.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-12-08 15:11:20 -0800
committerJunio C Hamano <gitster@pobox.com>2020-12-08 15:11:20 -0800
commit01b8886a62243c93cc57758bbaae08e11b09b9e1 (patch)
tree5fda28e41bc8ebc885e86bba7089a79080f8e865 /trace2.c
parent9b3b4adb3fc586d14bbe2bfa7ba5f682a87e903d (diff)
parenta2a066d96aeaa13fe9124b84978d333243aa17c9 (diff)
downloadgit-01b8886a62243c93cc57758bbaae08e11b09b9e1.tar.gz
Merge branch 'js/trace2-session-id'
The transport layer was taught to optionally exchange the session ID assigned by the trace2 subsystem during fetch/push transactions. * js/trace2-session-id: receive-pack: log received client session ID send-pack: advertise session ID in capabilities upload-pack, serve: log received client session ID fetch-pack: advertise session ID in capabilities transport: log received server session ID serve: advertise session ID in v2 capabilities receive-pack: advertise session ID in v0 capabilities upload-pack: advertise session ID in v0 capabilities trace2: add a public function for getting the SID docs: new transfer.advertiseSID option docs: new capability to advertise session IDs
Diffstat (limited to 'trace2.c')
-rw-r--r--trace2.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/trace2.c b/trace2.c
index 2c6b570077..256120c7fd 100644
--- a/trace2.c
+++ b/trace2.c
@@ -792,3 +792,8 @@ void trace2_printf(const char *fmt, ...)
va_end(ap);
}
#endif
+
+const char *trace2_session_id(void)
+{
+ return tr2_sid_get();
+}