diff options
| author |  Avery Pennarun <apenwarr@gmail.com> | 2009-08-26 10:41:03 -0400 |
|---|---|---|
| committer | Avery Pennarun <apenwarr@gmail.com> | 2009-08-26 10:42:27 -0400 |
| commit | 33aaa697a2386a02002f9fb8439d11243f12e1c7 (patch) | |
| tree | 5b5d8e60fe23ce070832c07429f9abdedc015824 /git-subtree.sh | |
| parent | Add explicit path of git installation by 'git --exec-path'. (diff) | |
| download | tgif-33aaa697a2386a02002f9fb8439d11243f12e1c7.tar.xz | |
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.
Diffstat (limited to 'git-subtree.sh')
| -rwxr-xr-x | git-subtree.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-subtree.sh b/git-subtree.sh index c5c0201448..f7d2fe408d 100755 --- a/git-subtree.sh +++ b/git-subtree.sh @@ -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= |