Improve patch to use git --exec-path: add to PATH instead.
authorAvery Pennarun <apenwarr@gmail.com>
Wed, 26 Aug 2009 14:41:03 +0000 (10:41 -0400)
committerAvery Pennarun <apenwarr@gmail.com>
Wed, 26 Aug 2009 14:42:27 +0000 (10:42 -0400)
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.

git-subtree.sh

index c5c0201448eb455ef29a25f5a2950d85ea74363f..f7d2fe408dfda272f4b3dd2327d013f2ac6ef7fc 100755 (executable)
@@ -27,7 +27,8 @@ 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 $?)
-. $(git --exec-path)/git-sh-setup
+PATH=$(git --exec-path):$PATH
+. git-sh-setup
 require_work_tree
 
 quiet=