From: Avery Pennarun <apenwarr@gmail.com>
Date: Thu, 24 Jun 2010 20:57:58 +0000 (-0400)
Subject: Another fix for PATH and msysgit.
X-Git-Tag: v1.7.11-rc0~176^2~12
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df2302d77449832eb4167999d747aef57e4bd1fc;p=git.git

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.
---

diff --git a/git-subtree.sh b/git-subtree.sh
index a15d91ffb..781eef378 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -30,10 +30,8 @@ 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
+PATH=$PATH:$(git --exec-path)
 . git-sh-setup
-PATH=$OPATH  # apparently needed for some versions of msysgit
 
 require_work_tree