[PATCH] Invoke git-repo-config directly.
- From
- Qingning Huo <qhuo@mayhq.co.uk>
- Date
- Mar 14, 2006, 21:10 UTC
- Message-ID
- <20060314211022.GA12498@localhost.localdomain>
The system have GNU git installed at /usr/bin/git. I installed git-core to ~/opt/bin. ~/opt/bin is in my PATH, but is after /usr/bin. I have set alias git="$HOME/opt/bin/git".
git-push and git-pull behaves strangely, because they call "git repo-config", which runs /usr/bin/git. Using "git-repo-config" directly fixed the problem.
Signed-off-by: Qingning Huo <qhuo@mayhq.co.uk>
---
git-pull.sh | 4 ++-- git-sh-setup.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
a0194fff002cb12ac58b202201d387f8ea55b225
diff --git a/git-pull.sh b/git-pull.sh index 6caf1aa..e32e2b0 100755 --- a/git-pull.sh +++ b/git-pull.sh @@ -70,7 +70,7 @@ case "$merge_head" in exit 0 ;; ?*' '?*) - var=`git repo-config --get pull.octopus` + var=`git-repo-config --get pull.octopus` if test '' = "$var" then strategy_default_args='-s octopus' @@ -79,7 +79,7 @@ case "$merge_head" in fi ;; *) - var=`git repo-config --get pull.twohead` + var=`git-repo-config --get pull.twohead` if test '' = "$var" then strategy_default_args='-s recursive' diff --git a/git-sh-setup.sh b/git-sh-setup.sh index 025ef2d..12f5ede 100755 --- a/git-sh-setup.sh +++ b/git-sh-setup.sh @@ -41,7 +41,7 @@ then : ${GIT_OBJECT_DIRECTORY="$GIT_DIR/objects"} # Make sure we are in a valid repository of a vintage we understand. - GIT_DIR="$GIT_DIR" git repo-config --get core.nosuch >/dev/null + GIT_DIR="$GIT_DIR" git-repo-config --get core.nosuch >/dev/null if test $? = 128 then exit
-- 1.2.4.ga019-dirty