mirror of
https://github.com/git/git
synced 2024-08-26 19:19:18 +00:00
(Hopefully) fix PATH setting for msysgit.
Reported by Evan Shaw. The problem is that $(git --exec-path) includes a 'git' binary which is incompatible with the one in /usr/bin; if you run it, it gives you an error about libiconv2.dll. You might think we could just add $(git --exec-path) at the *end* of PATH, but then if there are multiple versions of git installed, we could end up with the wrong one; earlier versions used to put git-sh-setup in /usr/bin, so we'd pick up that one before the new one. So now we just set PATH back to its original value right after running git-sh-setup, and we should be okay.
This commit is contained in:
parent
c00d1d1168
commit
9c632ea29c
|
@ -29,8 +29,12 @@ rejoin merge the new branch back into HEAD
|
|||
squash merge subtree changes as a single commit
|
||||
"
|
||||
eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
|
||||
|
||||
OPATH=$PATH
|
||||
PATH=$(git --exec-path):$PATH
|
||||
. git-sh-setup
|
||||
PATH=$OPATH # apparently needed for some versions of msysgit
|
||||
|
||||
require_work_tree
|
||||
|
||||
quiet=
|
||||
|
|
Loading…
Reference in a new issue