git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Cc: Daniel Barkalow <barkalow@iabervon.org>,
	Jay Soffian <jaysoffian@gmail.com>,
	Junio C Hamano <gitster@pobox.com>
Subject: [PATCH 1/2] transport: cleanup duplicated ref fetching code
Date: Sun, 15 Feb 2009 15:00:57 -0500	[thread overview]
Message-ID: <20090215200057.GA26779@coredump.intra.peff.net> (raw)
In-Reply-To: <20090215195826.GA26740@coredump.intra.peff.net>

When fetching refs through the git protocol, the
fetch_refs_via_pack will establish the connection and get
the ref list if it has not already been done.

Since the code is only two lines, it was done inline rather
than calling the transport's get_refs function. However,
calling that function better matches the intent, and is
future-proof against enhancements in get_refs_via_connect.

Signed-off-by: Jeff King <peff@peff.net>
---
Enhancements like the one that is coming in the next patch.

Though I think that fetch_pack doesn't currently care if the HEAD symref
is set up, it makes sense to me to be consistent.

 transport.c |    6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/transport.c b/transport.c
index 9ad4a16..c9f31f6 100644
--- a/transport.c
+++ b/transport.c
@@ -646,10 +646,8 @@ static int fetch_refs_via_pack(struct transport *transport,
 	for (i = 0; i < nr_heads; i++)
 		origh[i] = heads[i] = xstrdup(to_fetch[i]->name);
 
-	if (!data->conn) {
-		connect_setup(transport);
-		get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0, NULL);
-	}
+	if (!data->conn)
+		refs_tmp = transport->get_refs_list(transport);
 
 	refs = fetch_pack(&args, data->fd, data->conn,
 			  refs_tmp ? refs_tmp : transport->remote_refs,
-- 
1.6.2.rc0.258.gcef3.dirty

  reply	other threads:[~2009-02-15 20:02 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-02-13  8:54 [PATCH 0/4] remote HEAD improvements take 2 Jay Soffian
2009-02-13  8:54 ` [PATCH 1/4] builtin-clone: move locate_head() to remote.c so it can be re-used Jay Soffian
2009-02-13  8:54   ` [PATCH 2/4] builtin-remote: move duplicated cleanup code its own function Jay Soffian
2009-02-13  8:54     ` [PATCH 3/4] builtin-remote: teach show to display remote HEAD Jay Soffian
2009-02-13  8:54       ` [PATCH 4/4] builtin-remote: add set-head verb Jay Soffian
2009-02-13 10:09         ` Junio C Hamano
2009-02-13 10:21           ` Jay Soffian
2009-02-13 11:42             ` [PATCH v2 4/4] builtin-remote: add set-head subcommand Jay Soffian
2009-02-13 10:35           ` [PATCH 4/4] builtin-remote: add set-head verb Junio C Hamano
2009-02-13 10:52             ` Jay Soffian
2009-02-14  0:22           ` Jeff King
2009-02-14  2:00             ` Junio C Hamano
2009-02-14  2:18               ` Jeff King
2009-02-14  2:48                 ` Jay Soffian
2009-02-14  2:59               ` Jay Soffian
2009-02-14  3:43                 ` Jeff King
2009-02-14 10:30                   ` [PATCH] builtin-remote: better handling of multiple remote HEADs Jay Soffian
2009-02-14 17:54                     ` Jeff King
2009-02-14 18:35                       ` Jay Soffian
2009-02-14 18:54                         ` Jeff King
2009-02-14 19:48                           ` Junio C Hamano
2009-02-14 20:21                       ` Daniel Barkalow
2009-02-14 21:15                         ` Jeff King
2009-02-15  6:08                           ` Jeff King
2009-02-15  6:10                             ` [PATCH 1/5] test scripts: refactor start_httpd helper Jeff King
2009-02-15  6:12                             ` [PATCH 2/5] add basic http clone/fetch tests Jeff King
2009-02-15  8:01                               ` Junio C Hamano
2009-02-15  6:12                             ` [PATCH 3/5] refactor find_refs_by_name to accept const list Jeff King
2009-02-15  6:16                             ` [PATCH 4/5] remote: refactor guess_remote_head Jeff King
2009-02-15  6:18                             ` [PATCH 5/5] remote: use exact HEAD lookup if it is available Jeff King
2009-02-15 15:22                               ` Jay Soffian
2009-02-15 19:58                               ` Jeff King
2009-02-15 20:00                                 ` Jeff King [this message]
2009-02-15 20:01                                 ` [PATCH 2/2] transport: unambiguously determine local HEAD Jeff King
2009-02-15  5:27                     ` [PATCH] builtin-remote: better handling of multiple remote HEADs Jeff King
2009-02-15  5:34                       ` Jeff King
2009-02-15 14:13                       ` Jay Soffian
2009-02-15 15:12                         ` Jeff King
2009-02-16  2:21                         ` Junio C Hamano
2009-02-16  2:58                           ` Jay Soffian
2009-02-13  8:57 ` [PATCH 0/4] remote HEAD improvements take 2 Jay Soffian

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20090215200057.GA26779@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jaysoffian@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).