From: Qingning Huo <qhuo@mayhq.co.uk>
To: git@vger.kernel.org
Cc: junkio@cox.net
Subject: [PATCH] Invoke git-repo-config directly.
Date: Tue, 14 Mar 2006 21:10:22 +0000 [thread overview]
Message-ID: <20060314211022.GA12498@localhost.localdomain> (raw)
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
next reply other threads:[~2006-03-14 21:10 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-03-14 21:10 Qingning Huo [this message]
2006-03-14 21:20 ` [PATCH] Invoke git-repo-config directly Johannes Schindelin
2006-03-14 21:30 ` Qingning Huo
2006-03-14 21:58 ` Linus Torvalds
2006-03-14 22:40 ` Qingning Huo
2006-03-14 23:07 ` Linus Torvalds
2006-03-15 20:40 ` Qingning Huo
2006-03-15 21:33 ` Junio C Hamano
2006-03-15 21:35 ` Junio C Hamano
2006-03-15 22:11 ` Qingning Huo
2006-03-15 22:51 ` Linus Torvalds
2006-03-15 23:35 ` Junio C Hamano
2006-03-16 7:53 ` Qingning Huo
2006-03-16 7:57 ` Junio C Hamano
2006-03-16 8:26 ` Junio C Hamano
2006-03-16 12:53 ` Mark Wooding
2006-03-16 13:53 ` Andreas Ericsson
2006-03-17 2:10 ` Junio C Hamano
2006-03-17 10:51 ` Mark Wooding
2006-03-16 14:27 ` Timo Hirvonen
2006-03-16 14:39 ` Andreas Ericsson
2006-03-16 20:33 ` Qingning Huo
2006-03-16 10:14 ` Junio C Hamano
2006-03-16 11:55 ` Andreas Ericsson
2006-03-16 19:27 ` Jon Loeliger
2006-03-16 19:32 ` Jon Loeliger
2006-03-16 6:37 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060314211022.GA12498@localhost.localdomain \
--to=qhuo@mayhq.co.uk \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox