Improve patch to use git --exec-path: add to PATH instead.
If you (like me) are using a modified git straight out of its source directory (ie. without installing), then --exec-path isn't actually correct. Add it to the PATH instead, so if it is correct, it'll work, but if it's not, we fall back to the previous behaviour.
Avery Pennarun committed
Aug 26, 2009 at 10:41 UTC
33aaa697a2386a02002f9fb8439d11243f12e1c7
1 file changed
+2
-1
git-subtree.sh
+2
-1
@@ -27,7 +27,8 @@ rejoin merge the new branch back into HEAD
27
squash merge subtree changes as a single commit
28
"
29
eval $(echo "$OPTS_SPEC" | git rev-parse --parseopt -- "$@" || echo exit $?)
30
-. $(git --exec-path)/git-sh-setup
30
+PATH=$(git --exec-path):$PATH
31
+. git-sh-setup
32
require_work_tree
33
34
quiet=