On Thu, Jan 13, 2022 at 10:01:07PM -0800, Junio C Hamano wrote:
> Josh Steadmon <steadmon@xxxxxxxxxx> writes:
>
> > This behavior breaks certain tests that examine trace2 output when the
> > tests run as a child of another git process, such as in `git rebase -x
> > "make test"`.
>
> Well explained. The paragraph makes it clear how easy to trigger
> and get bitten by this problem.
>
> > While we could fix this by unsetting the relevant variables in the
> > affected tests (currently t0210, t0211, t0212, and t6421), this would
> > leave other tests vulnerable to similar breakage if new test cases are
> > added which inspect trace2 output. So fix this in general by unsetting
> > GIT_TRACE2_PARENT_NAME and GIT_TRACE2_PARENT_SID in test-lib.sh.
>
> This probably makes sense, but I wonder how it interacts with a user
> who runs "cd t && GIT_TRACE2=blah ./t0987-test-this.sh" to trace the
> entire test script, though.
>
> > Reported-by: Emily Shaffer <emilyshaffer@xxxxxxxxxx>
> > Helped-by: Jonathan Tan <jonathantanmy@xxxxxxxxxx>
> > Signed-off-by: Josh Steadmon <steadmon@xxxxxxxxxx>
> > ---
> > t/test-lib.sh | 2 ++
> > 1 file changed, 2 insertions(+)
> >
> > diff --git a/t/test-lib.sh b/t/test-lib.sh
> > index 0f7a137c7d..e4716b0b86 100644
> > --- a/t/test-lib.sh
> > +++ b/t/test-lib.sh
> > @@ -449,6 +449,8 @@ unset VISUAL EMAIL LANGUAGE $("$PERL_PATH" -e '
> > unset XDG_CACHE_HOME
> > unset XDG_CONFIG_HOME
> > unset GITPERLLIB
> > +unset GIT_TRACE2_PARENT_NAME
> > +unset GIT_TRACE2_PARENT_SID
>
> Hmph. Have you noticed the more generic "We want to unset almost
> everything that begins with GIT_, other than those selected few that
> are designed to be used to affect the tests" above the part you
> touched?
>
> I am wondering if we should tweak the list there, instead of special
> casing these two and these two only. There is a pattern that allows
> anything that match "^GIT_(other|TRACE|things)", and I suspect that
> the pattern is way too loose (i.e. it allows any garbage to follow,
> and by allowing "TRACE", it also catches "TRACE2" because the former
> is a prefix of the latter), which is a problem.
I was thinking the same thing, but I suspect that this may truly be
different. That list says we should be able to keep anything that looks
like GIT_TRACE in our environment. So the same should be true of
TRACE2-related variables, I'd think.
But the PARENT_NAME and PARENT_SID variables are (as far as I can tell
from reading around) internal variables that help us piece together the
names of the Git commands we ran.
In other words, excluding all TRACE2 variables goes too far since it
prevents us from being able to `GIT_TRACE2=1 make test`. But we would
want to clear out any internal TRACE2 variables such as PARENT_NAME and
PARENT_SID.
Thanks,
Taylor
