git-request-pull: open-code the only invocation of get_remote_url

Uwe Kleine-König · gitster · commit 1a92777504af · 2011-03-02T12:26:58.000-08:00
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 &lt;u.kleine-koenig@pengutronix.de&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git 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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,6 @@ p show patch text as well`
`15`	`15`	`'`
`16`	`16`
`17`	`17`	`. git-sh-setup`
`18`		`-. git-parse-remote`
`19`	`18`
`20`	`19`	`GIT_PAGER=`
`21`	`20`	`export GIT_PAGER`
`@@ -55,7 +54,7 @@ branch=$(git ls-remote "$url" \`
`55`	`54`	`p`
`56`	`55`	`q`
`57`	`56`	`}")`
`58`		`-url=$(get_remote_url "$url")`
	`57`	`+url=$(git ls-remote --get-url "$url")`
`59`	`58`	`if [ -z "$branch" ]; then`
`60`	`59`	`echo "warn: No branch of $url is at:" >&2`
`61`	`60`	`git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2`