request-pull: allow ls-remote to notice remote.$nickname.uploadpack
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 <tgrennan@redback.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
54bc13ce53
commit
33016c4913
@ -28,13 +28,13 @@ headrev=`git rev-parse --verify "$head"^0` || exit
|
|||||||
merge_base=`git merge-base $baserev $headrev` ||
|
merge_base=`git merge-base $baserev $headrev` ||
|
||||||
die "fatal: No commits in common between $base and $head"
|
die "fatal: No commits in common between $base and $head"
|
||||||
|
|
||||||
url=$(get_remote_url "$url")
|
|
||||||
branch=$(git ls-remote "$url" \
|
branch=$(git ls-remote "$url" \
|
||||||
| sed -n -e "/^$headrev refs.heads./{
|
| sed -n -e "/^$headrev refs.heads./{
|
||||||
s/^.* refs.heads.//
|
s/^.* refs.heads.//
|
||||||
p
|
p
|
||||||
q
|
q
|
||||||
}")
|
}")
|
||||||
|
url=$(get_remote_url "$url")
|
||||||
if [ -z "$branch" ]; then
|
if [ -z "$branch" ]; then
|
||||||
echo "warn: No branch of $url is at:" >&2
|
echo "warn: No branch of $url is at:" >&2
|
||||||
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
|
git log --max-count=1 --pretty='tformat:warn: %h: %s' $headrev >&2
|
||||||
|
Loading…
Reference in New Issue
Block a user