drop "match" parameter from get_remote_heads
The get_remote_heads function reads the list of remote refs during git protocol session. It dates all the way back todef88e9
(Commit first cut at "git-fetch-pack", 2005-07-04). At that time, the idea was to come up with a list of refs we were interested in, and then filter the list as we got it from the remote side. Later,1baaae5
(Make maximal use of the remote refs, 2005-10-28) stopped filtering at the get_remote_heads layer, letting us use the non-matching refs to find common history. As a result, all callers now simply pass an empty match list (and any future callers will want to do the same). So let's drop these now-useless parameters. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
10dd3b2bf1
commit
afe7c5ff1f
@ -976,7 +976,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
|
|||||||
args.verbose ? CONNECT_VERBOSE : 0);
|
args.verbose ? CONNECT_VERBOSE : 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
get_remote_heads(fd[0], &ref, 0, NULL, 0, NULL);
|
get_remote_heads(fd[0], &ref, 0, NULL);
|
||||||
|
|
||||||
ref = fetch_pack(&args, fd, conn, ref, dest,
|
ref = fetch_pack(&args, fd, conn, ref, dest,
|
||||||
nr_heads, heads, pack_lockfile_ptr);
|
nr_heads, heads, pack_lockfile_ptr);
|
||||||
|
@ -494,8 +494,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
|||||||
|
|
||||||
memset(&extra_have, 0, sizeof(extra_have));
|
memset(&extra_have, 0, sizeof(extra_have));
|
||||||
|
|
||||||
get_remote_heads(fd[0], &remote_refs, 0, NULL, REF_NORMAL,
|
get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
|
||||||
&extra_have);
|
|
||||||
|
|
||||||
transport_verify_remote_names(nr_refspecs, refspecs);
|
transport_verify_remote_names(nr_refspecs, refspecs);
|
||||||
|
|
||||||
|
2
cache.h
2
cache.h
@ -1033,7 +1033,7 @@ struct extra_have_objects {
|
|||||||
int nr, alloc;
|
int nr, alloc;
|
||||||
unsigned char (*array)[20];
|
unsigned char (*array)[20];
|
||||||
};
|
};
|
||||||
extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *);
|
extern struct ref **get_remote_heads(int in, struct ref **list, unsigned int flags, struct extra_have_objects *);
|
||||||
extern int server_supports(const char *feature);
|
extern int server_supports(const char *feature);
|
||||||
|
|
||||||
extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
|
extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
|
||||||
|
@ -53,7 +53,6 @@ static void add_extra_have(struct extra_have_objects *extra, unsigned char *sha1
|
|||||||
* Read all the refs from the other end
|
* Read all the refs from the other end
|
||||||
*/
|
*/
|
||||||
struct ref **get_remote_heads(int in, struct ref **list,
|
struct ref **get_remote_heads(int in, struct ref **list,
|
||||||
int nr_match, char **match,
|
|
||||||
unsigned int flags,
|
unsigned int flags,
|
||||||
struct extra_have_objects *extra_have)
|
struct extra_have_objects *extra_have)
|
||||||
{
|
{
|
||||||
@ -92,8 +91,6 @@ struct ref **get_remote_heads(int in, struct ref **list,
|
|||||||
|
|
||||||
if (!check_ref(name, name_len, flags))
|
if (!check_ref(name, name_len, flags))
|
||||||
continue;
|
continue;
|
||||||
if (nr_match && !path_match(name, nr_match, match))
|
|
||||||
continue;
|
|
||||||
ref = alloc_ref(buffer + 41);
|
ref = alloc_ref(buffer + 41);
|
||||||
hashcpy(ref->old_sha1, old_sha1);
|
hashcpy(ref->old_sha1, old_sha1);
|
||||||
*list = ref;
|
*list = ref;
|
||||||
|
@ -200,7 +200,7 @@ static struct ref *parse_git_refs(struct discovery *heads)
|
|||||||
|
|
||||||
if (start_async(&async))
|
if (start_async(&async))
|
||||||
die("cannot start thread to parse advertised refs");
|
die("cannot start thread to parse advertised refs");
|
||||||
get_remote_heads(async.out, &list, 0, NULL, 0, NULL);
|
get_remote_heads(async.out, &list, 0, NULL);
|
||||||
close(async.out);
|
close(async.out);
|
||||||
if (finish_async(&async))
|
if (finish_async(&async))
|
||||||
die("ref parsing thread failed");
|
die("ref parsing thread failed");
|
||||||
|
@ -502,7 +502,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
|
|||||||
struct ref *refs;
|
struct ref *refs;
|
||||||
|
|
||||||
connect_setup(transport, for_push, 0);
|
connect_setup(transport, for_push, 0);
|
||||||
get_remote_heads(data->fd[0], &refs, 0, NULL,
|
get_remote_heads(data->fd[0], &refs,
|
||||||
for_push ? REF_NORMAL : 0, &data->extra_have);
|
for_push ? REF_NORMAL : 0, &data->extra_have);
|
||||||
data->got_remote_heads = 1;
|
data->got_remote_heads = 1;
|
||||||
|
|
||||||
@ -537,7 +537,7 @@ static int fetch_refs_via_pack(struct transport *transport,
|
|||||||
|
|
||||||
if (!data->got_remote_heads) {
|
if (!data->got_remote_heads) {
|
||||||
connect_setup(transport, 0, 0);
|
connect_setup(transport, 0, 0);
|
||||||
get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0, NULL);
|
get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
|
||||||
data->got_remote_heads = 1;
|
data->got_remote_heads = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -772,8 +772,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
|
|||||||
struct ref *tmp_refs;
|
struct ref *tmp_refs;
|
||||||
connect_setup(transport, 1, 0);
|
connect_setup(transport, 1, 0);
|
||||||
|
|
||||||
get_remote_heads(data->fd[0], &tmp_refs, 0, NULL, REF_NORMAL,
|
get_remote_heads(data->fd[0], &tmp_refs, REF_NORMAL, NULL);
|
||||||
NULL);
|
|
||||||
data->got_remote_heads = 1;
|
data->got_remote_heads = 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user