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 to def88e9 (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>
Jeff King committed
Dec 12, 2011 at 19:41 UTC
afe7c5ff1f7f6741d35f9852a766d151da23d7d8
6 files changed
+7
-12
builtin/fetch-pack.c
+1
-1
@@ -976,7 +976,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
976
args.verbose ? CONNECT_VERBOSE : 0);
977
}
978
979
- get_remote_heads(fd[0], &ref, 0, NULL, 0, NULL);
979
+ get_remote_heads(fd[0], &ref, 0, NULL);
980
981
ref = fetch_pack(&args, fd, conn, ref, dest,
982
nr_heads, heads, pack_lockfile_ptr);
builtin/send-pack.c
+1
-2
@@ -494,8 +494,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
494
495
memset(&extra_have, 0, sizeof(extra_have));
496
497
- get_remote_heads(fd[0], &remote_refs, 0, NULL, REF_NORMAL,
498
- &extra_have);
497
+ get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
498
499
transport_verify_remote_names(nr_refspecs, refspecs);
500
cache.h
+1
-1
@@ -1033,7 +1033,7 @@ struct extra_have_objects {
1033
int nr, alloc;
1034
unsigned char (*array)[20];
1035
};
1036
-extern struct ref **get_remote_heads(int in, struct ref **list, int nr_match, char **match, unsigned int flags, struct extra_have_objects *);
1036
+extern struct ref **get_remote_heads(int in, struct ref **list, unsigned int flags, struct extra_have_objects *);
1037
extern int server_supports(const char *feature);
1038
1039
extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
connect.c
-3
@@ -53,7 +53,6 @@ static void add_extra_have(struct extra_have_objects *extra, unsigned char *sha1
53
* Read all the refs from the other end
54
*/
55
struct ref **get_remote_heads(int in, struct ref **list,
56
- int nr_match, char **match,
56
unsigned int flags,
57
struct extra_have_objects *extra_have)
58
{
@@ -92,8 +91,6 @@ struct ref **get_remote_heads(int in, struct ref **list,
91
92
if (!check_ref(name, name_len, flags))
93
continue;
95
- if (nr_match && !path_match(name, nr_match, match))
96
- continue;
94
ref = alloc_ref(buffer + 41);
95
hashcpy(ref->old_sha1, old_sha1);
96
*list = ref;
remote-curl.c
+1
-1
@@ -200,7 +200,7 @@ static struct ref *parse_git_refs(struct discovery *heads)
200
201
if (start_async(&async))
202
die("cannot start thread to parse advertised refs");
203
- get_remote_heads(async.out, &list, 0, NULL, 0, NULL);
203
+ get_remote_heads(async.out, &list, 0, NULL);
204
close(async.out);
205
if (finish_async(&async))
206
die("ref parsing thread failed");
transport.c
+3
-4
@@ -502,7 +502,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
502
struct ref *refs;
503
504
connect_setup(transport, for_push, 0);
505
- get_remote_heads(data->fd[0], &refs, 0, NULL,
505
+ get_remote_heads(data->fd[0], &refs,
506
for_push ? REF_NORMAL : 0, &data->extra_have);
507
data->got_remote_heads = 1;
508
@@ -537,7 +537,7 @@ static int fetch_refs_via_pack(struct transport *transport,
537
538
if (!data->got_remote_heads) {
539
connect_setup(transport, 0, 0);
540
- get_remote_heads(data->fd[0], &refs_tmp, 0, NULL, 0, NULL);
540
+ get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
541
data->got_remote_heads = 1;
542
}
543
@@ -772,8 +772,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
772
struct ref *tmp_refs;
773
connect_setup(transport, 1, 0);
774
775
- get_remote_heads(data->fd[0], &tmp_refs, 0, NULL, REF_NORMAL,
776
- NULL);
775
+ get_remote_heads(data->fd[0], &tmp_refs, REF_NORMAL, NULL);
776
data->got_remote_heads = 1;
777
}
778