# [PATCH] Make "git request-pull" use the configured remote.REMOTE.uploadpack 4 messages from 2009-07-27 to 2009-07-29. Participants: Tom Grennan, Santi Béjar, Junio C Hamano. Thread: https://gitlist.dev/t/20251 ## Tom Grennan, 2009-07-27 21:02 Subject: [PATCH] Make "git request-pull" use the configured remote.REMOTE.uploadpack Message-ID: <1248728563-23906-1-git-send-email-tgrennan@redback.com> URL: https://gitlist.dev/e/1248728563-23906-1-git-send-email-tgrennan%40redback.com ``` git-request-pull.sh should use git-parse-remote:get_uploadpack() to load a configured remote.REMOTE.uploadpack like "git remote show" and "git fetch". This allows one to specify the path of git-upload-pack on the remote side. Signed-off-by: Tom Grennan --- git-request-pull.sh | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/git-request-pull.sh b/git-request-pull.sh index a2cf5b8..612e94d 100755 --- a/git-request-pull.sh +++ b/git-request-pull.sh @@ -25,8 +25,9 @@ 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" +upload_pack=$(get_uploadpack "$url") url=$(get_remote_url "$url") -branch=$(git ls-remote "$url" \ +branch=$(git ls-remote --upload-pack="$upload_pack" "$url" \ | sed -n -e "/^$headrev refs.heads./{ s/^.* refs.heads.// p -- 1.6.2.1.dirty ``` ## Santi Béjar, 2009-07-29 00:13 Subject: Re: [PATCH] Make "git request-pull" use the configured remote.REMOTE.uploadpack Message-ID: URL: https://gitlist.dev/e/adf1fd3d0907281713t378440eamb39baae3be6d41c4%40mail.gmail.com In-Reply-To: <1248728563-23906-1-git-send-email-tgrennan@redback.com> ``` 2009/7/27 Tom Grennan : > git-request-pull.sh should use git-parse-remote:get_uploadpack() to > load a configured remote.REMOTE.uploadpack like "git remote show" and > "git fetch". This allows one to specify the path of git-upload-pack on > the remote side. Sorry, but I removed all unused functions from git-parse-remote in 62d955f (parse-remote: remove unused functions, 2009-06-12), and it is in v1.6.4-rc1. I don't think there is much problem reverting part of that commit, but I wonder if the problem is that "git ls-remote" does not read the remote..uploadpack by itself as it reads the remote..url. Santi ``` ## Tom Grennan, 2009-07-29 01:30 Subject: Re: [PATCH] Make "git request-pull" use the configured remote.REMOTE.uploadpack Message-ID: <20090729013002.GM4850@redback.com> URL: https://gitlist.dev/e/20090729013002.GM4850%40redback.com In-Reply-To: ``` On Tue, Jul 28, 2009 at 05:13:30PM -0700, Santi Béjar wrote: >2009/7/27 Tom Grennan : >> git-request-pull.sh should use git-parse-remote:get_uploadpack() to >> load a configured remote.REMOTE.uploadpack like "git remote show" and >> "git fetch". This allows one to specify the path of git-upload-pack on >> the remote side. > >Sorry, but I removed all unused functions from git-parse-remote in 62d955f >(parse-remote: remove unused functions, 2009-06-12), and it is in >v1.6.4-rc1. I don't think there is much problem reverting part of that commit, >but I wonder if the problem is that "git ls-remote" does not read the >remote..uploadpack by itself as it reads the remote..url. > >Santi Thanks for the hint. Yes, "git ls-remote" is retrieving remote..uploadpack when dest is a configured remote. However, git-request-pull runs ls-remote after converting its URL argument from remote..url The following works with v1.6.4-rc3-12-gdf73af5 If you wish, I'll submit an alternative patch. -- TomG diff --git a/git-request-pull.sh b/git-request-pull.sh index 5917773..fd95bea 100755 --- 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 ``` ## Junio C Hamano, 2009-07-29 05:05 Subject: Re: [PATCH] Make "git request-pull" use the configured remote.REMOTE.uploadpack Message-ID: <7vws5syt78.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7vws5syt78.fsf%40alter.siamese.dyndns.org In-Reply-To: <20090729013002.GM4850@redback.com> ``` Tom Grennan writes: > On Tue, Jul 28, 2009 at 05:13:30PM -0700, Santi Béjar wrote: >>2009/7/27 Tom Grennan : >>> git-request-pull.sh should use git-parse-remote:get_uploadpack() to >>> load a configured remote.REMOTE.uploadpack like "git remote show" and >>> "git fetch". This allows one to specify the path of git-upload-pack on >>> the remote side. >> >>Sorry, but I removed all unused functions from git-parse-remote in 62d955f >>(parse-remote: remove unused functions, 2009-06-12), and it is in >>v1.6.4-rc1. I don't think there is much problem reverting part of that commit, >>but I wonder if the problem is that "git ls-remote" does not read the >>remote..uploadpack by itself as it reads the remote..url. >> >>Santi > > Thanks for the hint. > > Yes, "git ls-remote" is retrieving remote..uploadpack when > dest is a configured remote. However, git-request-pull runs ls-remote > after converting its URL argument from remote..url Thanks, both. -- >8 -- From: Tom Grennan Date: Tue, 28 Jul 2009 18:30:02 -0700 Subject: 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 --- diff --git a/git-request-pull.sh b/git-request-pull.sh index 5917773..fd95bea 100755 --- 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 ```