Re: [PATCH 19/30] subtree: give `$(git --exec-path)` precedence over `$PATH`
- From
=?utf-8?B?w4Z2YXIgQXJuZmrDtnLDsA==?= Bjarmason <avarab@gmail.com>
- Date
- Apr 26, 2021, 08:27 UTC
- Message-ID
- <87bla11oo3.fsf@evledraar.gmail.com>
- In-Reply-To
- <20210423194230.1388945-20-lukeshu@lukeshu.com>
On Fri, Apr 23 2021, Luke Shumaker wrote:
Show 21 quoted lines
> From: Luke Shumaker <lukeshu@datawire.io> > > Other Git commands implemented in shell give `git --exec-path` > precedence over the existing $PATH, but subtree gives the existing $PATH > precedence. Flip subtree's PATH around to match what other commands do. > > Signed-off-by: Luke Shumaker <lukeshu@datawire.io> > --- > contrib/subtree/git-subtree.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh > index 3105eb8033..9d365c9f2f 100755 > --- a/contrib/subtree/git-subtree.sh > +++ b/contrib/subtree/git-subtree.sh > @@ -28,7 +28,7 @@ rejoin merge the new branch back into HEAD > squash merge subtree changes as a single commit > " > > -PATH=$PATH:$(git --exec-path) > +PATH=$(git --exec-path):$PATH
The history of git-subtree.sh suggests that instead of this change we'd be better of removing this PATH assignment, and then later doing:
. "$(git --exec-path)/git-sh-setup"
Isn't that closer to what git-subtree.sh wants here?