Re: [PATCH] t7900: use pwd -P in macOS maintenance test
- From
Eric Sunshine <sunshine@sunshineco.com>
- Date
- May 23, 2025, 21:24 UTC
- Message-ID
- <CAPig+cQLG+zveZg73E=TiC5uShhhRXKmK5Z_M8zN3fpGNEN1ng@mail.gmail.com>
- In-Reply-To
- <xmqqsekvvz1t.fsf@gitster.g>
On Fri, May 23, 2025 at 4:42 PM Junio C Hamano <gitster@pobox.com> wrote:
Show 19 quoted lines
> Eric Sunshine <sunshine@sunshineco.com> writes:
> >> - pfx=$(cd "$HOME" && pwd) &&
> >> + pfx=$(cd "$HOME" && pwd -P) &&
> >
> > However, have you tested this on Windows? I ask because, despite the
> > test's name, this and most of the tests in this script, are actually
> > run on all platforms, and because `pwd` is overridden by a shell
> > function for MinGW on Windows:
> >
> > # t/test-lib.sh
> > ...
> > # git sees Windows-style pwd
> > pwd () {
> > builtin pwd -W
> > }
>
> Because pwd emulation we use on Windows ignores -P the updated
> caller, pfx with this change would not change the existing
> behaviour.True. I overlooked that[*].
[*]: This is the second time in two days I made a stupid mistake when replying to a patch. I should probably stop trying to read/review patches while my mind is more focused on whatever task I'm actually working on despite having a few moments available while waiting for a compilation or other lengthy operation to finish.
> How would one test this situation on Windows, I wonder? Create a > directory that is pointed at by a symbolic link, and use it as the > test directory (either have the checkout there, or use --root to > have the trash directory there)?
Perhaps(?). The Windows experts on the list are probably better suited to answer.
Show 13 quoted lines
> > [*]: In the long run, a better fix would probably be for the tests to > > sanitize the output of the Git command, replacing (via `sed`) the > > actual emitted path with some placeholder, such as "%HOME%" or > > something, and then have the tests look for (`grep` or whatnot) > > needles using that literal placeholder rather than trying to perfectly > > match the path emitted by Git. This approach makes sense since these > > tests are about overall functionality of git-maintenance, not about > > the specific path in which the person happens to be running the tests. > > Another approach may be to do a form of chdir that forces the shell > to figure out where it really is upfront at the beginning of a test > script, perhaps inside test-lib.sh which happend before anything > meaningful happens in the test (i.e. "cd -P ." or something).
Hmm, I'm not sure how that would help this particular case which wants to know the path of $HOME:
pfx=$(cd "$HOME" && pwd -P) &&