summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUwe Kleine-König <u.kleine-koenig@pengutronix.de>2011-03-01 09:21:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-03-02 20:26:58 (GMT)
commit1a92777504afc09e071d7d828e084e6a4dadfce2 (patch)
tree81478998977e632cbb878a87401e9380bc0b837f
parent45781adb9a89c0c47f61ccf8062be26b86a38a54 (diff)
downloadgit-1a92777504afc09e071d7d828e084e6a4dadfce2.zip
git-1a92777504afc09e071d7d828e084e6a4dadfce2.tar.gz
git-1a92777504afc09e071d7d828e084e6a4dadfce2.tar.bz2
git-request-pull: open-code the only invocation of get_remote_url
So sh:get_remote_url can go now and git-request-pull doesn't need to source git-parse-remote. anymore. Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--git-parse-remote.sh4
-rwxr-xr-xgit-request-pull.sh3
2 files changed, 1 insertions, 6 deletions
diff --git a/git-parse-remote.sh b/git-parse-remote.sh
index 0ab1192..e7013f7 100644
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@ -4,10 +4,6 @@
# this would fail in that case and would issue an error message.
GIT_DIR=$(git rev-parse -q --git-dir) || :;
-get_remote_url () {
- git ls-remote --get-url "$1"
-}
-
get_default_remote () {
curr_branch=$(git symbolic-ref -q HEAD | sed -e 's|^refs/heads/||')
origin=$(git config --get "branch.$curr_branch.remote")
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 6fdea39..fc080cc 100755
--- a/git-request-pull.sh
+++ b/git-request-pull.sh
@@ -15,7 +15,6 @@ p show patch text as well
'
. git-sh-setup
-. git-parse-remote
GIT_PAGER=
export GIT_PAGER
@@ -55,7 +54,7 @@ branch=$(git ls-remote "$url" \
p
q
}")
-url=$(get_remote_url "$url")
+url=$(git ls-remote --get-url "$url")
if [ -z "$branch" ]; then
echo "warn: No branch of $url is at:" >&2
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2