summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Grennan <tgrennan@redback.com>2009-07-28 18:30:02 -0700
committerJunio C Hamano <gitster@pobox.com>2009-07-28 23:31:38 -0700
commit33016c491367c5144b3007927cd76492ac193d16 (patch)
tree1cf7203ba782e1bf912ecf51ceacae7df92b26bb
parent54bc13ce5300bf7c2237aba3fd123dd587e56d31 (diff)
downloadgit-33016c491367c5144b3007927cd76492ac193d16.tar.gz
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>
-rwxr-xr-xgit-request-pull.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-request-pull.sh b/git-request-pull.sh
index 5917773240..fd95beadab 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