undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transport: add got_remote_refs flag

Browse Source 
transport_get_remote_refs() in tranport.c checks transport->remote_refs
to determine whether transport->get_refs_list() should be invoked.  The
logic is "if it is NULL, we haven't run ls-remote to find out yet".

However, transport->remote_refs could still be NULL while cloning from
an empty repository.  This causes get_refs_list() to be run unnecessarily.

Introduce a flag, transport->got_remote_refs, to more explicitly record
if we have run transport->get_refs_list() already.

Signed-off-by: Tay Ray Chuan <rctay89@gmail.com>
Acked-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Tay Ray Chuan 2010-02-16 15:18:21 +08:00 committed by Junio C Hamano
parent e923eaeb90
commit b0d66e156c
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
transport.c
View File

@ -918,6 +918,7 @@ struct transport *transport_get(struct remote *remote, const char *url)
if (!remote) if (!remote)
die("No remote provided to transport_get()"); die("No remote provided to transport_get()");
ret->got_remote_refs = 0;
ret->remote = remote; ret->remote = remote;
helper = remote->foreign_vcs; helper = remote->foreign_vcs;
@ -1079,8 +1080,10 @@ int transport_push(struct transport *transport,
const struct ref *transport_get_remote_refs(struct transport *transport) const struct ref *transport_get_remote_refs(struct transport *transport)
{ {
if (!transport->remote_refs) if (!transport->got_remote_refs) {
transport->remote_refs = transport->get_refs_list(transport, 0); transport->remote_refs = transport->get_refs_list(transport, 0);
transport->got_remote_refs = 1;
}
return transport->remote_refs; return transport->remote_refs;
} }

6
transport.h
View File

@ -19,6 +19,12 @@ struct transport {
void *data; void *data;
const struct ref *remote_refs; const struct ref *remote_refs;
/**
* Indicates whether we already called get_refs_list(); set by
* transport.c::transport_get_remote_refs().
*/
unsigned got_remote_refs : 1;
/** /**
* Returns 0 if successful, positive if the option is not * Returns 0 if successful, positive if the option is not
* recognized or is inapplicable, and negative if the option * recognized or is inapplicable, and negative if the option