request-pull: allow ls-remote to notice remote.$nickname.uploadpack

Tom Grennan · gitster · commit 33016c491367 · 2009-07-28T23:31:38.000-07:00
The location to pull from should be converted from the configured nickname
to URL in the message, but ls-remote should be fed the nickname so that
the command uses remote.$nickname.* variables, most notably "uploadpack".

Signed-off-by: Tom Grennan &lt;tgrennan@redback.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/git-request-pull.sh b/git-request-pull.sh
@@ -28,13 +28,13 @@ headrev=`git rev-parse --verify "$head"^0` || exit
 merge_base=`git merge-base $baserev $headrev` ||
 die "fatal: No commits in common between $base and $head"
 
-url=$(get_remote_url "$url")
 branch=$(git ls-remote "$url" \
 	| sed -n -e "/^$headrev	refs.heads./{
 		s/^.*	refs.heads.//
 		p
 		q
 	}")
+url=$(get_remote_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
@@ -28,13 +28,13 @@ headrev=`git rev-parse --verify "$head"^0` \|\| exit
`28`	`28`	merge_base=`git merge-base $baserev $headrev` \|\|
`29`	`29`	`die "fatal: No commits in common between $base and $head"`
`30`	`30`
`31`		`-url=$(get_remote_url "$url")`
`32`	`31`	`branch=$(git ls-remote "$url" \`
`33`	`32`	`\| sed -n -e "/^$headrev refs.heads./{`
`34`	`33`	`s/^.* refs.heads.//`
`35`	`34`	`p`
`36`	`35`	`q`
`37`	`36`	`}")`
	`37`	`+url=$(get_remote_url "$url")`
`38`	`38`	`if [ -z "$branch" ]; then`
`39`	`39`	`echo "warn: No branch of $url is at:" >&2`
`40`	`40`	`git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2`