From 33aaa697a2386a02002f9fb8439d11243f12e1c7 Mon Sep 17 00:00:00 2001 From: Avery Pennarun Date: Wed, 26 Aug 2009 10:41:03 -0400 Subject: [PATCH] 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. --- git-subtree.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/git-subtree.sh b/git-subtree.sh index c5c020144..f7d2fe408 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= -- 2.26.2