Merge branch 'sw/git-p4-unshelve-branched-files'

diff --git a/trace2/tr2_sid.c b/trace2/tr2_sid.c
index 50470954783672d7642d3359c5c581ace5f7b86c..6948fd41086f91e7b2439918666cad0320909a6a 100644 (file)
--- a/trace2/tr2_sid.c
+++ b/trace2/tr2_sid.c
@@ -2,7 +2,7 @@
 #include "trace2/tr2_tbuf.h"
 #include "trace2/tr2_sid.h"
 
-#define TR2_ENVVAR_PARENT_SID "GIT_TR2_PARENT_SID"
+#define TR2_ENVVAR_PARENT_SID "GIT_TRACE2_PARENT_SID"
 
 static struct strbuf tr2sid_buf = STRBUF_INIT;
 static int tr2sid_nr_git_parents;