From: Chris Frey <cdfrey@foursquare.net>
Date: Thu, 25 Jun 2009 21:21:35 +0000 (-0400)
Subject: git-remote: fix missing .uploadpack usage for show command
X-Git-Tag: v1.6.4-rc0~26^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=345a38039414366e91a32f3c01257c3afcf78e27;p=git.git

git-remote: fix missing .uploadpack usage for show command

For users pulling from machines with self compiled git installs,
in non-PATH locations, they can set the config option
remote.<name>.uploadpack to set the location of git-upload-pack.

When using 'git remote show <name>', the remote HEAD check
did not use the uploadpack configuration setting, and would
not use the configured program.

In builtin-remote.c, the config setting is already loaded
with the call to remote_get(), so this patch passes that remote
along to transport_get().

Signed-off-by: Chris Frey <cdfrey@foursquare.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/builtin-remote.c b/builtin-remote.c
index d436412d9..7685cfcaf 100644
--- a/builtin-remote.c
+++ b/builtin-remote.c
@@ -789,7 +789,7 @@ static int get_remote_ref_states(const char *name,
 	read_branches();
 
 	if (query) {
-		transport = transport_get(NULL, states->remote->url_nr > 0 ?
+		transport = transport_get(states->remote, states->remote->url_nr > 0 ?
 			states->remote->url[0] : NULL);
 		remote_refs = transport_get_remote_refs(transport);
 		transport_disconnect(transport);