@matheusbsbs / matheus-bagliano / commits / df2302d774
Fork 0

Another fix for PATH and msysgit.

Evan Shaw tells me the previous fix didn't work. Let's use this one instead, which he says does work. This fix is kind of wrong because it will run the "correct" git-sh-setup *after* the one in /usr/bin, if there is one, which could be weird if you have multiple versions of git installed. But it works on my Linux and his msysgit, so it's obviously better than what we had before.

Avery Pennarun committed Jun 24, 2010 at 16:57 UTC df2302d77449832eb4167999d747aef57e4bd1fc
1 file changed +1 -3
git-subtree.sh
+1 -3
@@ -30,10 +30,8 @@ squash merge subtree changes as a single commit
30 "
31 eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
32
33 -OPATH=$PATH
34 -PATH=$(git --exec-path):$PATH
33 +PATH=$PATH:$(git --exec-path)
34 . git-sh-setup
36 -PATH=$OPATH # apparently needed for some versions of msysgit
35
36 require_work_tree
37