From: kTln2 <gianluca.pacchiella@ktln2.org>
Date: Thu, 20 Aug 2009 11:30:45 +0000 (+0200)
Subject: Add explicit path of git installation by 'git --exec-path'.
X-Git-Tag: v1.7.11-rc0~176^2~39
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2987e6add3;p=thirdparty%2Fgit.git

Add explicit path of git installation by 'git --exec-path'.

As pointed out by documentation, the correct use of 'git-sh-setup' is
using $(git --exec-path) to avoid problems with not standard
installations.

Signed-off-by: gianluca.pacchiella <pacchiel@studenti.ph.unito.it>
---

diff --git a/git-subtree.sh b/git-subtree.sh
index 962d5ff509..c5c0201448 100755
--- a/git-subtree.sh
+++ b/git-subtree.sh
@@ -27,7 +27,7 @@ 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-sh-setup
+. $(git --exec-path)/git-sh-setup
 require_work_tree
 
 quiet=