teach get_remote_heads to read from a memory buffer
Now that we can read packet data from memory as easily as a descriptor, get_remote_heads can take either one as a source. This will allow further refactoring in remote-curl. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
Feb 20, 2013 at 15:06 UTC
85edf4f58b5368e2f2acc4bce0d10e1ca9d6c879
6 files changed
+12
-10
builtin/fetch-pack.c
+1
-1
@@ -125,7 +125,7 @@ int cmd_fetch_pack(int argc, const char **argv, const char *prefix)
125
args.verbose ? CONNECT_VERBOSE : 0);
126
}
127
128
- get_remote_heads(fd[0], &ref, 0, NULL);
128
+ get_remote_heads(fd[0], NULL, 0, &ref, 0, NULL);
129
130
ref = fetch_pack(&args, fd, conn, ref, dest,
131
&sought, pack_lockfile_ptr);
builtin/send-pack.c
+1
-1
@@ -207,7 +207,7 @@ int cmd_send_pack(int argc, const char **argv, const char *prefix)
207
208
memset(&extra_have, 0, sizeof(extra_have));
209
210
- get_remote_heads(fd[0], &remote_refs, REF_NORMAL, &extra_have);
210
+ get_remote_heads(fd[0], NULL, 0, &remote_refs, REF_NORMAL, &extra_have);
211
212
transport_verify_remote_names(nr_refspecs, refspecs);
213
cache.h
+3
-1
@@ -1049,7 +1049,9 @@ struct extra_have_objects {
1049
int nr, alloc;
1050
unsigned char (*array)[20];
1051
};
1052
-extern struct ref **get_remote_heads(int in, struct ref **list, unsigned int flags, struct extra_have_objects *);
1052
+extern struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
1053
+ struct ref **list, unsigned int flags,
1054
+ struct extra_have_objects *);
1055
extern int server_supports(const char *feature);
1056
extern int parse_feature_request(const char *features, const char *feature);
1057
extern const char *server_feature_value(const char *feature, int *len_ret);
connect.c
+3
-3
@@ -62,8 +62,8 @@ static void die_initial_contact(int got_at_least_one_head)
62
/*
63
* Read all the refs from the other end
64
*/
65
-struct ref **get_remote_heads(int in, struct ref **list,
66
- unsigned int flags,
65
+struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
66
+ struct ref **list, unsigned int flags,
67
struct extra_have_objects *extra_have)
68
{
69
int got_at_least_one_head = 0;
@@ -76,7 +76,7 @@ struct ref **get_remote_heads(int in, struct ref **list,
76
int len, name_len;
77
char *buffer = packet_buffer;
78
79
- len = packet_read(in, NULL, NULL,
79
+ len = packet_read(in, &src_buf, &src_len,
80
packet_buffer, sizeof(packet_buffer),
81
PACKET_READ_GENTLE_ON_EOF |
82
PACKET_READ_CHOMP_NEWLINE);
remote-curl.c
+1
-1
@@ -192,7 +192,7 @@ static struct ref *parse_git_refs(struct discovery *heads, int for_push)
192
193
if (start_async(&async))
194
die("cannot start thread to parse advertised refs");
195
- get_remote_heads(async.out, &list,
195
+ get_remote_heads(async.out, NULL, 0, &list,
196
for_push ? REF_NORMAL : 0, NULL);
197
close(async.out);
198
if (finish_async(&async))
transport.c
+3
-3
@@ -507,7 +507,7 @@ static struct ref *get_refs_via_connect(struct transport *transport, int for_pus
507
struct ref *refs;
508
509
connect_setup(transport, for_push, 0);
510
- get_remote_heads(data->fd[0], &refs,
510
+ get_remote_heads(data->fd[0], NULL, 0, &refs,
511
for_push ? REF_NORMAL : 0, &data->extra_have);
512
data->got_remote_heads = 1;
513
@@ -541,7 +541,7 @@ static int fetch_refs_via_pack(struct transport *transport,
541
542
if (!data->got_remote_heads) {
543
connect_setup(transport, 0, 0);
544
- get_remote_heads(data->fd[0], &refs_tmp, 0, NULL);
544
+ get_remote_heads(data->fd[0], NULL, 0, &refs_tmp, 0, NULL);
545
data->got_remote_heads = 1;
546
}
547
@@ -799,7 +799,7 @@ static int git_transport_push(struct transport *transport, struct ref *remote_re
799
struct ref *tmp_refs;
800
connect_setup(transport, 1, 0);
801
802
- get_remote_heads(data->fd[0], &tmp_refs, REF_NORMAL, NULL);
802
+ get_remote_heads(data->fd[0], NULL, 0, &tmp_refs, REF_NORMAL, NULL);
803
data->got_remote_heads = 1;
804
}
805