user-manual.txt: render ASCII art correctly under Asciidoctor
[git/git.git] / fetch-pack.c
CommitLineData
745f7a8c 1#include "cache.h"
a49d2834 2#include "repository.h"
b2141fc1 3#include "config.h"
697cc8ef 4#include "lockfile.h"
745f7a8c
NTND
5#include "refs.h"
6#include "pkt-line.h"
7#include "commit.h"
8#include "tag.h"
d807c4a0 9#include "exec-cmd.h"
745f7a8c
NTND
10#include "pack.h"
11#include "sideband.h"
12#include "fetch-pack.h"
13#include "remote.h"
14#include "run-command.h"
47a59185 15#include "connect.h"
745f7a8c
NTND
16#include "transport.h"
17#include "version.h"
beea4152 18#include "sha1-array.h"
fdb69d33 19#include "oidset.h"
0abe14f6 20#include "packfile.h"
cbd53a21 21#include "object-store.h"
cf1e7c07 22#include "connected.h"
ec062838 23#include "fetch-negotiator.h"
1362df0d 24#include "fsck.h"
745f7a8c
NTND
25
26static int transfer_unpack_limit = -1;
27static int fetch_unpack_limit = -1;
28static int unpack_limit = 100;
29static int prefer_ofs_delta = 1;
30static int no_done;
508ea882 31static int deepen_since_ok;
a45a2600 32static int deepen_not_ok;
745f7a8c
NTND
33static int fetch_fsck_objects = -1;
34static int transfer_fsck_objects = -1;
35static int agent_supported;
640d8b72 36static int server_supports_filtering;
6035d6aa
NTND
37static struct lock_file shallow_lock;
38static const char *alternate_shallow_file;
42cc7485 39static char *negotiation_algorithm;
1362df0d 40static struct strbuf fsck_msg_types = STRBUF_INIT;
745f7a8c 41
208acbfb 42/* Remember to update object flag allocation in object.h */
745f7a8c 43#define COMPLETE (1U << 0)
ec062838 44#define ALTERNATE (1U << 1)
745f7a8c
NTND
45
46/*
47 * After sending this many "have"s if we do not get any new ACK , we
48 * give up traversing our history.
49 */
50#define MAX_IN_VAIN 256
51
d30fe89c 52static int multi_ack, use_sideband;
7199c093
FM
53/* Allow specifying sha1 if it is a ref tip. */
54#define ALLOW_TIP_SHA1 01
68ee6289
FM
55/* Allow request of a sha1 if it is reachable from a ref (possibly hidden ref). */
56#define ALLOW_REACHABLE_SHA1 02
7199c093 57static unsigned int allow_unadvertised_object_request;
745f7a8c 58
0d789a5b
NTND
59__attribute__((format (printf, 2, 3)))
60static inline void print_verbose(const struct fetch_pack_args *args,
61 const char *fmt, ...)
62{
63 va_list params;
64
65 if (!args->verbose)
66 return;
67
68 va_start(params, fmt);
69 vfprintf(stderr, fmt, params);
70 va_end(params);
71 fputc('\n', stderr);
72}
73
41a078c6
JK
74struct alternate_object_cache {
75 struct object **items;
76 size_t nr, alloc;
77};
78
bdf4276c 79static void cache_one_alternate(const struct object_id *oid,
41a078c6
JK
80 void *vcache)
81{
82 struct alternate_object_cache *cache = vcache;
109cd76d 83 struct object *obj = parse_object(the_repository, oid);
41a078c6
JK
84
85 if (!obj || (obj->flags & ALTERNATE))
86 return;
87
88 obj->flags |= ALTERNATE;
89 ALLOC_GROW(cache->items, cache->nr + 1, cache->alloc);
90 cache->items[cache->nr++] = obj;
91}
92
ec062838
JT
93static void for_each_cached_alternate(struct fetch_negotiator *negotiator,
94 void (*cb)(struct fetch_negotiator *,
d30fe89c 95 struct object *))
41a078c6
JK
96{
97 static int initialized;
98 static struct alternate_object_cache cache;
99 size_t i;
100
101 if (!initialized) {
102 for_each_alternate_ref(cache_one_alternate, &cache);
103 initialized = 1;
104 }
105
106 for (i = 0; i < cache.nr; i++)
ec062838 107 cb(negotiator, cache.items[i]);
745f7a8c
NTND
108}
109
ec062838 110static int rev_list_insert_ref(struct fetch_negotiator *negotiator,
d30fe89c
JT
111 const char *refname,
112 const struct object_id *oid)
745f7a8c 113{
a74093da
SB
114 struct object *o = deref_tag(the_repository,
115 parse_object(the_repository, oid),
109cd76d 116 refname, 0);
745f7a8c
NTND
117
118 if (o && o->type == OBJ_COMMIT)
ec062838 119 negotiator->add_tip(negotiator, (struct commit *)o);
745f7a8c
NTND
120
121 return 0;
122}
123
b1b49c6e
MH
124static int rev_list_insert_ref_oid(const char *refname, const struct object_id *oid,
125 int flag, void *cb_data)
745f7a8c 126{
d30fe89c 127 return rev_list_insert_ref(cb_data, refname, oid);
745f7a8c
NTND
128}
129
130enum ack_type {
131 NAK = 0,
132 ACK,
133 ACK_continue,
134 ACK_common,
135 ACK_ready
136};
137
01f9ec64
MS
138static void consume_shallow_list(struct fetch_pack_args *args,
139 struct packet_reader *reader)
745f7a8c 140{
79891cb9 141 if (args->stateless_rpc && args->deepen) {
745f7a8c
NTND
142 /* If we sent a depth we will get back "duplicate"
143 * shallow and unshallow commands every time there
144 * is a block of have lines exchanged.
145 */
01f9ec64
MS
146 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
147 if (starts_with(reader->line, "shallow "))
745f7a8c 148 continue;
01f9ec64 149 if (starts_with(reader->line, "unshallow "))
745f7a8c 150 continue;
1dd73e20 151 die(_("git fetch-pack: expected shallow list"));
745f7a8c 152 }
01f9ec64
MS
153 if (reader->status != PACKET_READ_FLUSH)
154 die(_("git fetch-pack: expected a flush packet after shallow list"));
745f7a8c
NTND
155 }
156}
157
01f9ec64
MS
158static enum ack_type get_ack(struct packet_reader *reader,
159 struct object_id *result_oid)
745f7a8c 160{
74543a04 161 int len;
82e56767 162 const char *arg;
745f7a8c 163
01f9ec64 164 if (packet_reader_read(reader) != PACKET_READ_NORMAL)
bc9d4dc5 165 die(_("git fetch-pack: expected ACK/NAK, got a flush packet"));
01f9ec64
MS
166 len = reader->pktlen;
167
168 if (!strcmp(reader->line, "NAK"))
745f7a8c 169 return NAK;
01f9ec64 170 if (skip_prefix(reader->line, "ACK ", &arg)) {
1b283377 171 if (!get_oid_hex(arg, result_oid)) {
82e56767 172 arg += 40;
01f9ec64 173 len -= arg - reader->line;
82e56767 174 if (len < 1)
030e9dd6 175 return ACK;
82e56767 176 if (strstr(arg, "continue"))
745f7a8c 177 return ACK_continue;
82e56767 178 if (strstr(arg, "common"))
745f7a8c 179 return ACK_common;
82e56767 180 if (strstr(arg, "ready"))
745f7a8c
NTND
181 return ACK_ready;
182 return ACK;
183 }
184 }
01f9ec64 185 die(_("git fetch-pack: expected ACK/NAK, got '%s'"), reader->line);
745f7a8c
NTND
186}
187
188static void send_request(struct fetch_pack_args *args,
189 int fd, struct strbuf *buf)
190{
191 if (args->stateless_rpc) {
192 send_sideband(fd, -1, buf->buf, buf->len, LARGE_PACKET_MAX);
193 packet_flush(fd);
37c80012
JK
194 } else {
195 if (write_in_full(fd, buf->buf, buf->len) < 0)
196 die_errno(_("unable to write to remote"));
197 }
745f7a8c
NTND
198}
199
ec062838 200static void insert_one_alternate_object(struct fetch_negotiator *negotiator,
d30fe89c 201 struct object *obj)
745f7a8c 202{
ec062838 203 rev_list_insert_ref(negotiator, NULL, &obj->oid);
745f7a8c
NTND
204}
205
206#define INITIAL_FLUSH 16
207#define PIPESAFE_FLUSH 32
da470981 208#define LARGE_FLUSH 16384
745f7a8c 209
685fbd32 210static int next_flush(int stateless_rpc, int count)
745f7a8c 211{
685fbd32 212 if (stateless_rpc) {
da470981
JT
213 if (count < LARGE_FLUSH)
214 count <<= 1;
215 else
216 count = count * 11 / 10;
217 } else {
218 if (count < PIPESAFE_FLUSH)
219 count <<= 1;
220 else
221 count += PIPESAFE_FLUSH;
222 }
745f7a8c
NTND
223 return count;
224}
225
3390e42a
JT
226static void mark_tips(struct fetch_negotiator *negotiator,
227 const struct oid_array *negotiation_tips)
228{
229 int i;
230
231 if (!negotiation_tips) {
232 for_each_ref(rev_list_insert_ref_oid, negotiator);
233 return;
234 }
235
236 for (i = 0; i < negotiation_tips->nr; i++)
237 rev_list_insert_ref(negotiator, NULL,
238 &negotiation_tips->oid[i]);
239 return;
240}
241
ec062838 242static int find_common(struct fetch_negotiator *negotiator,
d30fe89c 243 struct fetch_pack_args *args,
1b283377 244 int fd[2], struct object_id *result_oid,
745f7a8c
NTND
245 struct ref *refs)
246{
247 int fetching;
248 int count = 0, flushes = 0, flush_at = INITIAL_FLUSH, retval;
1b283377 249 const struct object_id *oid;
745f7a8c
NTND
250 unsigned in_vain = 0;
251 int got_continue = 0;
252 int got_ready = 0;
253 struct strbuf req_buf = STRBUF_INIT;
254 size_t state_len = 0;
01f9ec64 255 struct packet_reader reader;
745f7a8c
NTND
256
257 if (args->stateless_rpc && multi_ack == 1)
1dd73e20 258 die(_("--stateless-rpc requires multi_ack_detailed"));
745f7a8c 259
01f9ec64 260 packet_reader_init(&reader, fd[0], NULL, 0,
2d103c31
MS
261 PACKET_READ_CHOMP_NEWLINE |
262 PACKET_READ_DIE_ON_ERR_PACKET);
01f9ec64 263
12f19a98
JT
264 if (!args->no_dependents) {
265 mark_tips(negotiator, args->negotiation_tips);
266 for_each_cached_alternate(negotiator, insert_one_alternate_object);
267 }
745f7a8c
NTND
268
269 fetching = 0;
270 for ( ; refs ; refs = refs->next) {
1b283377 271 struct object_id *remote = &refs->old_oid;
745f7a8c
NTND
272 const char *remote_hex;
273 struct object *o;
274
275 /*
276 * If that object is complete (i.e. it is an ancestor of a
277 * local ref), we tell them we have it but do not have to
278 * tell them about its ancestors, which they already know
279 * about.
280 *
281 * We use lookup_object here because we are only
282 * interested in the case we *know* the object is
283 * reachable and we have already scanned it.
12f19a98
JT
284 *
285 * Do this only if args->no_dependents is false (if it is true,
286 * we cannot trust the object flags).
745f7a8c 287 */
12f19a98 288 if (!args->no_dependents &&
d0229abd 289 ((o = lookup_object(the_repository, remote)) != NULL) &&
745f7a8c
NTND
290 (o->flags & COMPLETE)) {
291 continue;
292 }
293
1b283377 294 remote_hex = oid_to_hex(remote);
745f7a8c
NTND
295 if (!fetching) {
296 struct strbuf c = STRBUF_INIT;
297 if (multi_ack == 2) strbuf_addstr(&c, " multi_ack_detailed");
298 if (multi_ack == 1) strbuf_addstr(&c, " multi_ack");
299 if (no_done) strbuf_addstr(&c, " no-done");
300 if (use_sideband == 2) strbuf_addstr(&c, " side-band-64k");
301 if (use_sideband == 1) strbuf_addstr(&c, " side-band");
cccf74e2 302 if (args->deepen_relative) strbuf_addstr(&c, " deepen-relative");
745f7a8c
NTND
303 if (args->use_thin_pack) strbuf_addstr(&c, " thin-pack");
304 if (args->no_progress) strbuf_addstr(&c, " no-progress");
305 if (args->include_tag) strbuf_addstr(&c, " include-tag");
306 if (prefer_ofs_delta) strbuf_addstr(&c, " ofs-delta");
508ea882 307 if (deepen_since_ok) strbuf_addstr(&c, " deepen-since");
a45a2600 308 if (deepen_not_ok) strbuf_addstr(&c, " deepen-not");
745f7a8c
NTND
309 if (agent_supported) strbuf_addf(&c, " agent=%s",
310 git_user_agent_sanitized());
640d8b72
JH
311 if (args->filter_options.choice)
312 strbuf_addstr(&c, " filter");
745f7a8c
NTND
313 packet_buf_write(&req_buf, "want %s%s\n", remote_hex, c.buf);
314 strbuf_release(&c);
315 } else
316 packet_buf_write(&req_buf, "want %s\n", remote_hex);
317 fetching++;
318 }
319
320 if (!fetching) {
321 strbuf_release(&req_buf);
322 packet_flush(fd[1]);
323 return 1;
324 }
325
c8813487 326 if (is_repository_shallow(the_repository))
1a30f5a2 327 write_shallow_commits(&req_buf, 1, NULL);
745f7a8c
NTND
328 if (args->depth > 0)
329 packet_buf_write(&req_buf, "deepen %d", args->depth);
508ea882 330 if (args->deepen_since) {
dddbad72 331 timestamp_t max_age = approxidate(args->deepen_since);
cb71f8bd 332 packet_buf_write(&req_buf, "deepen-since %"PRItime, max_age);
508ea882 333 }
a45a2600
NTND
334 if (args->deepen_not) {
335 int i;
336 for (i = 0; i < args->deepen_not->nr; i++) {
337 struct string_list_item *s = args->deepen_not->items + i;
338 packet_buf_write(&req_buf, "deepen-not %s", s->string);
339 }
340 }
87c2d9d3
JS
341 if (server_supports_filtering && args->filter_options.choice) {
342 struct strbuf expanded_filter_spec = STRBUF_INIT;
343 expand_list_objects_filter_spec(&args->filter_options,
344 &expanded_filter_spec);
640d8b72 345 packet_buf_write(&req_buf, "filter %s",
87c2d9d3
JS
346 expanded_filter_spec.buf);
347 strbuf_release(&expanded_filter_spec);
348 }
745f7a8c
NTND
349 packet_buf_flush(&req_buf);
350 state_len = req_buf.len;
351
79891cb9 352 if (args->deepen) {
ae021d87 353 const char *arg;
1b283377 354 struct object_id oid;
745f7a8c
NTND
355
356 send_request(args, fd[1], &req_buf);
01f9ec64
MS
357 while (packet_reader_read(&reader) == PACKET_READ_NORMAL) {
358 if (skip_prefix(reader.line, "shallow ", &arg)) {
1b283377 359 if (get_oid_hex(arg, &oid))
01f9ec64 360 die(_("invalid shallow line: %s"), reader.line);
19143f13 361 register_shallow(the_repository, &oid);
745f7a8c
NTND
362 continue;
363 }
01f9ec64 364 if (skip_prefix(reader.line, "unshallow ", &arg)) {
1b283377 365 if (get_oid_hex(arg, &oid))
01f9ec64 366 die(_("invalid unshallow line: %s"), reader.line);
d0229abd 367 if (!lookup_object(the_repository, &oid))
01f9ec64 368 die(_("object not found: %s"), reader.line);
745f7a8c 369 /* make sure that it is parsed as shallow */
109cd76d 370 if (!parse_object(the_repository, &oid))
01f9ec64 371 die(_("error in object: %s"), reader.line);
e92b848c 372 if (unregister_shallow(&oid))
01f9ec64 373 die(_("no shallow found: %s"), reader.line);
745f7a8c
NTND
374 continue;
375 }
01f9ec64 376 die(_("expected shallow/unshallow, got %s"), reader.line);
745f7a8c
NTND
377 }
378 } else if (!args->stateless_rpc)
379 send_request(args, fd[1], &req_buf);
380
381 if (!args->stateless_rpc) {
382 /* If we aren't using the stateless-rpc interface
383 * we don't need to retain the headers.
384 */
385 strbuf_setlen(&req_buf, 0);
386 state_len = 0;
387 }
388
389 flushes = 0;
390 retval = -1;
88e2f9ed
JT
391 if (args->no_dependents)
392 goto done;
ec062838 393 while ((oid = negotiator->next(negotiator))) {
1b283377 394 packet_buf_write(&req_buf, "have %s\n", oid_to_hex(oid));
395 print_verbose(args, "have %s", oid_to_hex(oid));
745f7a8c
NTND
396 in_vain++;
397 if (flush_at <= ++count) {
398 int ack;
399
400 packet_buf_flush(&req_buf);
401 send_request(args, fd[1], &req_buf);
402 strbuf_setlen(&req_buf, state_len);
403 flushes++;
685fbd32 404 flush_at = next_flush(args->stateless_rpc, count);
745f7a8c
NTND
405
406 /*
407 * We keep one window "ahead" of the other side, and
408 * will wait for an ACK only on the next one
409 */
410 if (!args->stateless_rpc && count == INITIAL_FLUSH)
411 continue;
412
01f9ec64 413 consume_shallow_list(args, &reader);
745f7a8c 414 do {
01f9ec64 415 ack = get_ack(&reader, result_oid);
0d789a5b 416 if (ack)
1dd73e20 417 print_verbose(args, _("got %s %d %s"), "ack",
1b283377 418 ack, oid_to_hex(result_oid));
745f7a8c
NTND
419 switch (ack) {
420 case ACK:
421 flushes = 0;
422 multi_ack = 0;
423 retval = 0;
424 goto done;
425 case ACK_common:
426 case ACK_ready:
427 case ACK_continue: {
428 struct commit *commit =
c1f5eb49
SB
429 lookup_commit(the_repository,
430 result_oid);
d093bc75 431 int was_common;
3a2a1dc1 432
745f7a8c 433 if (!commit)
1b283377 434 die(_("invalid commit %s"), oid_to_hex(result_oid));
ec062838 435 was_common = negotiator->ack(negotiator, commit);
745f7a8c
NTND
436 if (args->stateless_rpc
437 && ack == ACK_common
d093bc75 438 && !was_common) {
745f7a8c
NTND
439 /* We need to replay the have for this object
440 * on the next RPC request so the peer knows
441 * it is in common with us.
442 */
1b283377 443 const char *hex = oid_to_hex(result_oid);
745f7a8c
NTND
444 packet_buf_write(&req_buf, "have %s\n", hex);
445 state_len = req_buf.len;
06b3d386
JT
446 /*
447 * Reset in_vain because an ack
448 * for this commit has not been
449 * seen.
450 */
451 in_vain = 0;
452 } else if (!args->stateless_rpc
453 || ack != ACK_common)
454 in_vain = 0;
745f7a8c 455 retval = 0;
745f7a8c 456 got_continue = 1;
21bcf6e4 457 if (ack == ACK_ready)
745f7a8c 458 got_ready = 1;
745f7a8c
NTND
459 break;
460 }
461 }
462 } while (ack);
463 flushes--;
464 if (got_continue && MAX_IN_VAIN < in_vain) {
1dd73e20 465 print_verbose(args, _("giving up"));
745f7a8c
NTND
466 break; /* give up */
467 }
21bcf6e4
JT
468 if (got_ready)
469 break;
745f7a8c
NTND
470 }
471 }
472done:
473 if (!got_ready || !no_done) {
474 packet_buf_write(&req_buf, "done\n");
475 send_request(args, fd[1], &req_buf);
476 }
1dd73e20 477 print_verbose(args, _("done"));
745f7a8c
NTND
478 if (retval != 0) {
479 multi_ack = 0;
480 flushes++;
481 }
482 strbuf_release(&req_buf);
483
ff62eca7 484 if (!got_ready || !no_done)
01f9ec64 485 consume_shallow_list(args, &reader);
745f7a8c 486 while (flushes || multi_ack) {
01f9ec64 487 int ack = get_ack(&reader, result_oid);
745f7a8c 488 if (ack) {
1dd73e20 489 print_verbose(args, _("got %s (%d) %s"), "ack",
1b283377 490 ack, oid_to_hex(result_oid));
745f7a8c
NTND
491 if (ack == ACK)
492 return 0;
493 multi_ack = 1;
494 continue;
495 }
496 flushes--;
497 }
498 /* it is no error to fetch into a completely empty repo */
499 return count ? retval : 0;
500}
501
502static struct commit_list *complete;
503
1b283377 504static int mark_complete(const struct object_id *oid)
745f7a8c 505{
109cd76d 506 struct object *o = parse_object(the_repository, oid);
745f7a8c
NTND
507
508 while (o && o->type == OBJ_TAG) {
509 struct tag *t = (struct tag *) o;
510 if (!t->tagged)
511 break; /* broken repository */
512 o->flags |= COMPLETE;
109cd76d 513 o = parse_object(the_repository, &t->tagged->oid);
745f7a8c
NTND
514 }
515 if (o && o->type == OBJ_COMMIT) {
516 struct commit *commit = (struct commit *)o;
517 if (!(commit->object.flags & COMPLETE)) {
518 commit->object.flags |= COMPLETE;
16445242 519 commit_list_insert(commit, &complete);
745f7a8c
NTND
520 }
521 }
522 return 0;
523}
524
f8ee4d85
MH
525static int mark_complete_oid(const char *refname, const struct object_id *oid,
526 int flag, void *cb_data)
527{
1b283377 528 return mark_complete(oid);
f8ee4d85
MH
529}
530
745f7a8c 531static void mark_recent_complete_commits(struct fetch_pack_args *args,
dddbad72 532 timestamp_t cutoff)
745f7a8c
NTND
533{
534 while (complete && cutoff <= complete->item->date) {
1dd73e20 535 print_verbose(args, _("Marking %s as complete"),
0d789a5b 536 oid_to_hex(&complete->item->object.oid));
745f7a8c
NTND
537 pop_most_recent_commit(&complete, COMPLETE);
538 }
539}
540
fdb69d33
JT
541static void add_refs_to_oidset(struct oidset *oids, struct ref *refs)
542{
543 for (; refs; refs = refs->next)
544 oidset_insert(oids, &refs->old_oid);
545}
546
bf73282c
RS
547static int is_unmatched_ref(const struct ref *ref)
548{
549 struct object_id oid;
550 const char *p;
551 return ref->match_status == REF_NOT_MATCHED &&
552 !parse_oid_hex(ref->name, &oid, &p) &&
553 *p == '\0' &&
554 oideq(&oid, &ref->old_oid);
555}
556
745f7a8c 557static void filter_refs(struct fetch_pack_args *args,
f2db854d
JH
558 struct ref **refs,
559 struct ref **sought, int nr_sought)
745f7a8c
NTND
560{
561 struct ref *newlist = NULL;
562 struct ref **newtail = &newlist;
fdb69d33 563 struct ref *unmatched = NULL;
745f7a8c 564 struct ref *ref, *next;
fdb69d33 565 struct oidset tip_oids = OIDSET_INIT;
f2db854d 566 int i;
22a16465
RS
567 int strict = !(allow_unadvertised_object_request &
568 (ALLOW_TIP_SHA1 | ALLOW_REACHABLE_SHA1));
745f7a8c 569
f2db854d 570 i = 0;
745f7a8c
NTND
571 for (ref = *refs; ref; ref = next) {
572 int keep = 0;
573 next = ref->next;
f2db854d 574
50e19a83 575 if (starts_with(ref->name, "refs/") &&
34066f06
JK
576 check_refname_format(ref->name, 0)) {
577 /*
578 * trash or a peeled value; do not even add it to
579 * unmatched list
580 */
581 free_one_ref(ref);
582 continue;
583 } else {
f2db854d
JH
584 while (i < nr_sought) {
585 int cmp = strcmp(ref->name, sought[i]->name);
745f7a8c
NTND
586 if (cmp < 0)
587 break; /* definitely do not have it */
588 else if (cmp == 0) {
589 keep = 1; /* definitely have it */
d56583de 590 sought[i]->match_status = REF_MATCHED;
745f7a8c 591 }
f2db854d 592 i++;
745f7a8c 593 }
745f7a8c 594
e9502c0a
JK
595 if (!keep && args->fetch_all &&
596 (!args->deepen || !starts_with(ref->name, "refs/tags/")))
597 keep = 1;
598 }
745f7a8c
NTND
599
600 if (keep) {
601 *newtail = ref;
602 ref->next = NULL;
603 newtail = &ref->next;
604 } else {
fdb69d33
JT
605 ref->next = unmatched;
606 unmatched = ref;
745f7a8c
NTND
607 }
608 }
609
22a16465
RS
610 if (strict) {
611 for (i = 0; i < nr_sought; i++) {
612 ref = sought[i];
613 if (!is_unmatched_ref(ref))
614 continue;
615
616 add_refs_to_oidset(&tip_oids, unmatched);
617 add_refs_to_oidset(&tip_oids, newlist);
618 break;
619 }
620 }
621
6e7b66ee 622 /* Append unmatched requests to the list */
d56583de 623 for (i = 0; i < nr_sought; i++) {
d56583de 624 ref = sought[i];
bf73282c 625 if (!is_unmatched_ref(ref))
d56583de 626 continue;
6e7b66ee 627
22a16465 628 if (!strict || oidset_contains(&tip_oids, &ref->old_oid)) {
d56583de 629 ref->match_status = REF_MATCHED;
c3c17bf1
JK
630 *newtail = copy_ref(ref);
631 newtail = &(*newtail)->next;
d56583de
MM
632 } else {
633 ref->match_status = REF_UNADVERTISED_NOT_ALLOWED;
6e7b66ee
JH
634 }
635 }
fdb69d33
JT
636
637 oidset_clear(&tip_oids);
259eddde 638 free_refs(unmatched);
fdb69d33 639
745f7a8c
NTND
640 *refs = newlist;
641}
642
ec062838 643static void mark_alternate_complete(struct fetch_negotiator *unused,
d30fe89c 644 struct object *obj)
745f7a8c 645{
1b283377 646 mark_complete(&obj->oid);
745f7a8c
NTND
647}
648
024aa469
TI
649struct loose_object_iter {
650 struct oidset *loose_object_set;
651 struct ref *refs;
652};
653
34c29034
JT
654/*
655 * Mark recent commits available locally and reachable from a local ref as
656 * COMPLETE. If args->no_dependents is false, also mark COMPLETE remote refs as
657 * COMMON_REF (otherwise, we are not planning to participate in negotiation, and
658 * thus do not need COMMON_REF marks).
659 *
660 * The cutoff time for recency is determined by this heuristic: it is the
661 * earliest commit time of the objects in refs that are commits and that we know
662 * the commit time of.
663 */
ec062838 664static void mark_complete_and_common_ref(struct fetch_negotiator *negotiator,
d30fe89c 665 struct fetch_pack_args *args,
34c29034 666 struct ref **refs)
745f7a8c
NTND
667{
668 struct ref *ref;
a1c6d7c1 669 int old_save_commit_buffer = save_commit_buffer;
dddbad72 670 timestamp_t cutoff = 0;
745f7a8c
NTND
671
672 save_commit_buffer = 0;
673
674 for (ref = *refs; ref; ref = ref->next) {
675 struct object *o;
676
97b2fa08
JK
677 if (!has_object_file_with_flags(&ref->old_oid,
678 OBJECT_INFO_QUICK))
024aa469 679 continue;
109cd76d 680 o = parse_object(the_repository, &ref->old_oid);
745f7a8c
NTND
681 if (!o)
682 continue;
683
684 /* We already have it -- which may mean that we were
685 * in sync with the other side at some time after
686 * that (it is OK if we guess wrong here).
687 */
688 if (o->type == OBJ_COMMIT) {
689 struct commit *commit = (struct commit *)o;
690 if (!cutoff || cutoff < commit->date)
691 cutoff = commit->date;
692 }
693 }
694
12f19a98
JT
695 if (!args->deepen) {
696 for_each_ref(mark_complete_oid, NULL);
697 for_each_cached_alternate(NULL, mark_alternate_complete);
698 commit_list_sort_by_date(&complete);
699 if (cutoff)
700 mark_recent_complete_commits(args, cutoff);
701 }
745f7a8c 702
12f19a98
JT
703 /*
704 * Mark all complete remote refs as common refs.
705 * Don't mark them common yet; the server has to be told so first.
706 */
707 for (ref = *refs; ref; ref = ref->next) {
708 struct object *o = deref_tag(the_repository,
709 lookup_object(the_repository,
d0229abd 710 &ref->old_oid),
12f19a98 711 NULL, 0);
745f7a8c 712
12f19a98
JT
713 if (!o || o->type != OBJ_COMMIT || !(o->flags & COMPLETE))
714 continue;
745f7a8c 715
12f19a98
JT
716 negotiator->known_common(negotiator,
717 (struct commit *)o);
745f7a8c
NTND
718 }
719
34c29034
JT
720 save_commit_buffer = old_save_commit_buffer;
721}
722
723/*
724 * Returns 1 if every object pointed to by the given remote refs is available
725 * locally and reachable from a local ref, and 0 otherwise.
726 */
727static int everything_local(struct fetch_pack_args *args,
728 struct ref **refs)
729{
730 struct ref *ref;
731 int retval;
745f7a8c
NTND
732
733 for (retval = 1, ref = *refs; ref ; ref = ref->next) {
1b283377 734 const struct object_id *remote = &ref->old_oid;
745f7a8c
NTND
735 struct object *o;
736
d0229abd 737 o = lookup_object(the_repository, remote);
745f7a8c
NTND
738 if (!o || !(o->flags & COMPLETE)) {
739 retval = 0;
1b283377 740 print_verbose(args, "want %s (%s)", oid_to_hex(remote),
0d789a5b 741 ref->name);
745f7a8c
NTND
742 continue;
743 }
1b283377 744 print_verbose(args, _("already have %s (%s)"), oid_to_hex(remote),
0d789a5b 745 ref->name);
745f7a8c 746 }
a1c6d7c1 747
745f7a8c
NTND
748 return retval;
749}
750
751static int sideband_demux(int in, int out, void *data)
752{
753 int *xd = data;
9ff18faf 754 int ret;
745f7a8c 755
9ff18faf 756 ret = recv_sideband("fetch-pack", xd[0], out);
745f7a8c
NTND
757 close(out);
758 return ret;
759}
760
761static int get_pack(struct fetch_pack_args *args,
762 int xd[2], char **pack_lockfile)
763{
764 struct async demux;
745f7a8c 765 int do_keep = args->keep_pack;
984a43b9
JK
766 const char *cmd_name;
767 struct pack_header header;
768 int pass_header = 0;
d3180279 769 struct child_process cmd = CHILD_PROCESS_INIT;
c6807a40 770 int ret;
745f7a8c
NTND
771
772 memset(&demux, 0, sizeof(demux));
773 if (use_sideband) {
774 /* xd[] is talking with upload-pack; subprocess reads from
775 * xd[0], spits out band#2 to stderr, and feeds us band#1
776 * through demux->out.
777 */
778 demux.proc = sideband_demux;
779 demux.data = xd;
780 demux.out = -1;
df857572 781 demux.isolate_sigpipe = 1;
745f7a8c 782 if (start_async(&demux))
1dd73e20 783 die(_("fetch-pack: unable to fork off sideband demultiplexer"));
745f7a8c
NTND
784 }
785 else
786 demux.out = xd[0];
787
745f7a8c 788 if (!args->keep_pack && unpack_limit) {
745f7a8c
NTND
789
790 if (read_pack_header(demux.out, &header))
1dd73e20 791 die(_("protocol error: bad pack header"));
984a43b9 792 pass_header = 1;
745f7a8c
NTND
793 if (ntohl(header.hdr_entries) < unpack_limit)
794 do_keep = 0;
795 else
796 do_keep = 1;
797 }
798
6035d6aa 799 if (alternate_shallow_file) {
984a43b9
JK
800 argv_array_push(&cmd.args, "--shallow-file");
801 argv_array_push(&cmd.args, alternate_shallow_file);
6035d6aa
NTND
802 }
803
88e2f9ed 804 if (do_keep || args->from_promisor) {
745f7a8c
NTND
805 if (pack_lockfile)
806 cmd.out = -1;
984a43b9
JK
807 cmd_name = "index-pack";
808 argv_array_push(&cmd.args, cmd_name);
809 argv_array_push(&cmd.args, "--stdin");
745f7a8c 810 if (!args->quiet && !args->no_progress)
984a43b9 811 argv_array_push(&cmd.args, "-v");
745f7a8c 812 if (args->use_thin_pack)
984a43b9 813 argv_array_push(&cmd.args, "--fix-thin");
88e2f9ed 814 if (do_keep && (args->lock_pack || unpack_limit)) {
da25bdb7 815 char hostname[HOST_NAME_MAX + 1];
5781a9a2 816 if (xgethostname(hostname, sizeof(hostname)))
984a43b9
JK
817 xsnprintf(hostname, sizeof(hostname), "localhost");
818 argv_array_pushf(&cmd.args,
819 "--keep=fetch-pack %"PRIuMAX " on %s",
820 (uintmax_t)getpid(), hostname);
745f7a8c 821 }
c6807a40 822 if (args->check_self_contained_and_connected)
984a43b9 823 argv_array_push(&cmd.args, "--check-self-contained-and-connected");
88e2f9ed
JT
824 if (args->from_promisor)
825 argv_array_push(&cmd.args, "--promisor");
745f7a8c
NTND
826 }
827 else {
984a43b9
JK
828 cmd_name = "unpack-objects";
829 argv_array_push(&cmd.args, cmd_name);
745f7a8c 830 if (args->quiet || args->no_progress)
984a43b9 831 argv_array_push(&cmd.args, "-q");
c6807a40 832 args->check_self_contained_and_connected = 0;
745f7a8c 833 }
984a43b9
JK
834
835 if (pass_header)
836 argv_array_pushf(&cmd.args, "--pack_header=%"PRIu32",%"PRIu32,
837 ntohl(header.hdr_version),
838 ntohl(header.hdr_entries));
745f7a8c
NTND
839 if (fetch_fsck_objects >= 0
840 ? fetch_fsck_objects
841 : transfer_fsck_objects >= 0
842 ? transfer_fsck_objects
98a2ea46
JT
843 : 0) {
844 if (args->from_promisor)
845 /*
846 * We cannot use --strict in index-pack because it
847 * checks both broken objects and links, but we only
848 * want to check for broken objects.
849 */
850 argv_array_push(&cmd.args, "--fsck-objects");
851 else
1362df0d
ÆAB
852 argv_array_pushf(&cmd.args, "--strict%s",
853 fsck_msg_types.buf);
98a2ea46 854 }
745f7a8c
NTND
855
856 cmd.in = demux.out;
857 cmd.git_cmd = 1;
858 if (start_command(&cmd))
1dd73e20 859 die(_("fetch-pack: unable to fork off %s"), cmd_name);
745f7a8c
NTND
860 if (do_keep && pack_lockfile) {
861 *pack_lockfile = index_pack_lockfile(cmd.out);
862 close(cmd.out);
863 }
864
37cb1dd6
JL
865 if (!use_sideband)
866 /* Closed by start_command() */
867 xd[0] = -1;
868
c6807a40
NTND
869 ret = finish_command(&cmd);
870 if (!ret || (args->check_self_contained_and_connected && ret == 1))
871 args->self_contained_and_connected =
872 args->check_self_contained_and_connected &&
873 ret == 0;
874 else
1dd73e20 875 die(_("%s failed"), cmd_name);
745f7a8c 876 if (use_sideband && finish_async(&demux))
1dd73e20 877 die(_("error in sideband demultiplexer"));
745f7a8c
NTND
878 return 0;
879}
880
f2db854d
JH
881static int cmp_ref_by_name(const void *a_, const void *b_)
882{
883 const struct ref *a = *((const struct ref **)a_);
884 const struct ref *b = *((const struct ref **)b_);
885 return strcmp(a->name, b->name);
886}
887
745f7a8c
NTND
888static struct ref *do_fetch_pack(struct fetch_pack_args *args,
889 int fd[2],
890 const struct ref *orig_ref,
f2db854d 891 struct ref **sought, int nr_sought,
beea4152 892 struct shallow_info *si,
745f7a8c
NTND
893 char **pack_lockfile)
894{
895 struct ref *ref = copy_ref_list(orig_ref);
1b283377 896 struct object_id oid;
745f7a8c
NTND
897 const char *agent_feature;
898 int agent_len;
ec062838 899 struct fetch_negotiator negotiator;
42cc7485 900 fetch_negotiator_init(&negotiator, negotiation_algorithm);
745f7a8c
NTND
901
902 sort_ref_list(&ref, ref_compare_name);
9ed0d8d6 903 QSORT(sought, nr_sought, cmp_ref_by_name);
745f7a8c 904
0e042971
NTND
905 if ((agent_feature = server_feature_value("agent", &agent_len))) {
906 agent_supported = 1;
907 if (agent_len)
908 print_verbose(args, _("Server version is %.*s"),
909 agent_len, agent_feature);
910 }
911
5a88583b
NTND
912 if (server_supports("shallow"))
913 print_verbose(args, _("Server supports %s"), "shallow");
914 else if (args->depth > 0 || is_repository_shallow(the_repository))
1dd73e20 915 die(_("Server does not support shallow clients"));
a45a2600 916 if (args->depth > 0 || args->deepen_since || args->deepen_not)
79891cb9 917 args->deepen = 1;
745f7a8c 918 if (server_supports("multi_ack_detailed")) {
0778b293 919 print_verbose(args, _("Server supports %s"), "multi_ack_detailed");
745f7a8c
NTND
920 multi_ack = 2;
921 if (server_supports("no-done")) {
0778b293 922 print_verbose(args, _("Server supports %s"), "no-done");
745f7a8c
NTND
923 if (args->stateless_rpc)
924 no_done = 1;
925 }
926 }
927 else if (server_supports("multi_ack")) {
0778b293 928 print_verbose(args, _("Server supports %s"), "multi_ack");
745f7a8c
NTND
929 multi_ack = 1;
930 }
931 if (server_supports("side-band-64k")) {
0778b293 932 print_verbose(args, _("Server supports %s"), "side-band-64k");
745f7a8c
NTND
933 use_sideband = 2;
934 }
935 else if (server_supports("side-band")) {
0778b293 936 print_verbose(args, _("Server supports %s"), "side-band");
745f7a8c
NTND
937 use_sideband = 1;
938 }
6e7b66ee 939 if (server_supports("allow-tip-sha1-in-want")) {
0778b293 940 print_verbose(args, _("Server supports %s"), "allow-tip-sha1-in-want");
7199c093 941 allow_unadvertised_object_request |= ALLOW_TIP_SHA1;
6e7b66ee 942 }
68ee6289 943 if (server_supports("allow-reachable-sha1-in-want")) {
0778b293 944 print_verbose(args, _("Server supports %s"), "allow-reachable-sha1-in-want");
68ee6289
FM
945 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
946 }
5a88583b
NTND
947 if (server_supports("thin-pack"))
948 print_verbose(args, _("Server supports %s"), "thin-pack");
949 else
745f7a8c 950 args->use_thin_pack = 0;
5a88583b
NTND
951 if (server_supports("no-progress"))
952 print_verbose(args, _("Server supports %s"), "no-progress");
953 else
745f7a8c 954 args->no_progress = 0;
5a88583b
NTND
955 if (server_supports("include-tag"))
956 print_verbose(args, _("Server supports %s"), "include-tag");
957 else
745f7a8c 958 args->include_tag = 0;
0d789a5b 959 if (server_supports("ofs-delta"))
0778b293 960 print_verbose(args, _("Server supports %s"), "ofs-delta");
0d789a5b 961 else
745f7a8c
NTND
962 prefer_ofs_delta = 0;
963
640d8b72
JH
964 if (server_supports("filter")) {
965 server_supports_filtering = 1;
0778b293 966 print_verbose(args, _("Server supports %s"), "filter");
640d8b72
JH
967 } else if (args->filter_options.choice) {
968 warning("filtering not recognized by server, ignoring");
969 }
970
5a88583b
NTND
971 if (server_supports("deepen-since")) {
972 print_verbose(args, _("Server supports %s"), "deepen-since");
508ea882 973 deepen_since_ok = 1;
5a88583b 974 } else if (args->deepen_since)
508ea882 975 die(_("Server does not support --shallow-since"));
5a88583b
NTND
976 if (server_supports("deepen-not")) {
977 print_verbose(args, _("Server supports %s"), "deepen-not");
a45a2600 978 deepen_not_ok = 1;
5a88583b 979 } else if (args->deepen_not)
a45a2600 980 die(_("Server does not support --shallow-exclude"));
5a88583b
NTND
981 if (server_supports("deepen-relative"))
982 print_verbose(args, _("Server supports %s"), "deepen-relative");
983 else if (args->deepen_relative)
cccf74e2 984 die(_("Server does not support --deepen"));
745f7a8c 985
12f19a98
JT
986 if (!args->no_dependents) {
987 mark_complete_and_common_ref(&negotiator, args, &ref);
988 filter_refs(args, &ref, sought, nr_sought);
989 if (everything_local(args, &ref)) {
990 packet_flush(fd[1]);
991 goto all_done;
992 }
993 } else {
994 filter_refs(args, &ref, sought, nr_sought);
745f7a8c 995 }
ec062838 996 if (find_common(&negotiator, args, fd, &oid, ref) < 0)
745f7a8c
NTND
997 if (!args->keep_pack)
998 /* When cloning, it is not unusual to have
999 * no common commit.
1000 */
1dd73e20 1001 warning(_("no common commits"));
745f7a8c
NTND
1002
1003 if (args->stateless_rpc)
1004 packet_flush(fd[1]);
79891cb9 1005 if (args->deepen)
1a30f5a2
NTND
1006 setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
1007 NULL);
4820a33b 1008 else if (si->nr_ours || si->nr_theirs)
beea4152 1009 alternate_shallow_file = setup_temporary_shallow(si->shallow);
6da8bdcb
NTND
1010 else
1011 alternate_shallow_file = NULL;
745f7a8c 1012 if (get_pack(args, fd, pack_lockfile))
1dd73e20 1013 die(_("git fetch-pack: fetch failed."));
745f7a8c
NTND
1014
1015 all_done:
ec062838 1016 negotiator.release(&negotiator);
745f7a8c
NTND
1017 return ref;
1018}
1019
f7e20501
BW
1020static void add_shallow_requests(struct strbuf *req_buf,
1021 const struct fetch_pack_args *args)
1022{
00624d60 1023 if (is_repository_shallow(the_repository))
f7e20501
BW
1024 write_shallow_commits(req_buf, 1, NULL);
1025 if (args->depth > 0)
1026 packet_buf_write(req_buf, "deepen %d", args->depth);
1027 if (args->deepen_since) {
1028 timestamp_t max_age = approxidate(args->deepen_since);
1029 packet_buf_write(req_buf, "deepen-since %"PRItime, max_age);
1030 }
1031 if (args->deepen_not) {
1032 int i;
1033 for (i = 0; i < args->deepen_not->nr; i++) {
1034 struct string_list_item *s = args->deepen_not->items + i;
1035 packet_buf_write(req_buf, "deepen-not %s", s->string);
1036 }
1037 }
5056cf4a
JT
1038 if (args->deepen_relative)
1039 packet_buf_write(req_buf, "deepen-relative\n");
f7e20501
BW
1040}
1041
12f19a98 1042static void add_wants(int no_dependents, const struct ref *wants, struct strbuf *req_buf)
685fbd32 1043{
73302051
BW
1044 int use_ref_in_want = server_supports_feature("fetch", "ref-in-want", 0);
1045
685fbd32
BW
1046 for ( ; wants ; wants = wants->next) {
1047 const struct object_id *remote = &wants->old_oid;
685fbd32
BW
1048 struct object *o;
1049
1050 /*
1051 * If that object is complete (i.e. it is an ancestor of a
1052 * local ref), we tell them we have it but do not have to
1053 * tell them about its ancestors, which they already know
1054 * about.
1055 *
1056 * We use lookup_object here because we are only
1057 * interested in the case we *know* the object is
1058 * reachable and we have already scanned it.
12f19a98
JT
1059 *
1060 * Do this only if args->no_dependents is false (if it is true,
1061 * we cannot trust the object flags).
685fbd32 1062 */
12f19a98 1063 if (!no_dependents &&
d0229abd 1064 ((o = lookup_object(the_repository, remote)) != NULL) &&
685fbd32
BW
1065 (o->flags & COMPLETE)) {
1066 continue;
1067 }
1068
73302051
BW
1069 if (!use_ref_in_want || wants->exact_oid)
1070 packet_buf_write(req_buf, "want %s\n", oid_to_hex(remote));
1071 else
1072 packet_buf_write(req_buf, "want-ref %s\n", wants->name);
685fbd32
BW
1073 }
1074}
1075
1076static void add_common(struct strbuf *req_buf, struct oidset *common)
1077{
1078 struct oidset_iter iter;
1079 const struct object_id *oid;
1080 oidset_iter_init(common, &iter);
1081
1082 while ((oid = oidset_iter_next(&iter))) {
1083 packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid));
1084 }
1085}
1086
ec062838
JT
1087static int add_haves(struct fetch_negotiator *negotiator,
1088 struct strbuf *req_buf,
d30fe89c 1089 int *haves_to_send, int *in_vain)
685fbd32
BW
1090{
1091 int ret = 0;
1092 int haves_added = 0;
1093 const struct object_id *oid;
1094
ec062838 1095 while ((oid = negotiator->next(negotiator))) {
685fbd32
BW
1096 packet_buf_write(req_buf, "have %s\n", oid_to_hex(oid));
1097 if (++haves_added >= *haves_to_send)
1098 break;
1099 }
1100
1101 *in_vain += haves_added;
1102 if (!haves_added || *in_vain >= MAX_IN_VAIN) {
1103 /* Send Done */
1104 packet_buf_write(req_buf, "done\n");
1105 ret = 1;
1106 }
1107
1108 /* Increase haves to send on next round */
1109 *haves_to_send = next_flush(1, *haves_to_send);
1110
1111 return ret;
1112}
1113
ec062838 1114static int send_fetch_request(struct fetch_negotiator *negotiator, int fd_out,
d30fe89c 1115 const struct fetch_pack_args *args,
685fbd32 1116 const struct ref *wants, struct oidset *common,
0bbc0bc5
JT
1117 int *haves_to_send, int *in_vain,
1118 int sideband_all)
685fbd32
BW
1119{
1120 int ret = 0;
1121 struct strbuf req_buf = STRBUF_INIT;
1122
1123 if (server_supports_v2("fetch", 1))
1124 packet_buf_write(&req_buf, "command=fetch");
1125 if (server_supports_v2("agent", 0))
1126 packet_buf_write(&req_buf, "agent=%s", git_user_agent_sanitized());
5e3548ef
BW
1127 if (args->server_options && args->server_options->nr &&
1128 server_supports_v2("server-option", 1)) {
1129 int i;
1130 for (i = 0; i < args->server_options->nr; i++)
5b204b7d 1131 packet_buf_write(&req_buf, "server-option=%s",
5e3548ef
BW
1132 args->server_options->items[i].string);
1133 }
685fbd32
BW
1134
1135 packet_buf_delim(&req_buf);
1136 if (args->use_thin_pack)
1137 packet_buf_write(&req_buf, "thin-pack");
1138 if (args->no_progress)
1139 packet_buf_write(&req_buf, "no-progress");
1140 if (args->include_tag)
1141 packet_buf_write(&req_buf, "include-tag");
1142 if (prefer_ofs_delta)
1143 packet_buf_write(&req_buf, "ofs-delta");
0bbc0bc5
JT
1144 if (sideband_all)
1145 packet_buf_write(&req_buf, "sideband-all");
685fbd32 1146
f7e20501
BW
1147 /* Add shallow-info and deepen request */
1148 if (server_supports_feature("fetch", "shallow", 0))
1149 add_shallow_requests(&req_buf, args);
00624d60 1150 else if (is_repository_shallow(the_repository) || args->deepen)
f7e20501
BW
1151 die(_("Server does not support shallow requests"));
1152
ba95710a
JT
1153 /* Add filter */
1154 if (server_supports_feature("fetch", "filter", 0) &&
1155 args->filter_options.choice) {
87c2d9d3 1156 struct strbuf expanded_filter_spec = STRBUF_INIT;
ba95710a 1157 print_verbose(args, _("Server supports filter"));
87c2d9d3
JS
1158 expand_list_objects_filter_spec(&args->filter_options,
1159 &expanded_filter_spec);
ba95710a 1160 packet_buf_write(&req_buf, "filter %s",
87c2d9d3
JS
1161 expanded_filter_spec.buf);
1162 strbuf_release(&expanded_filter_spec);
ba95710a
JT
1163 } else if (args->filter_options.choice) {
1164 warning("filtering not recognized by server, ignoring");
1165 }
1166
685fbd32 1167 /* add wants */
12f19a98 1168 add_wants(args->no_dependents, wants, &req_buf);
685fbd32 1169
ba95710a
JT
1170 if (args->no_dependents) {
1171 packet_buf_write(&req_buf, "done");
1172 ret = 1;
1173 } else {
1174 /* Add all of the common commits we've found in previous rounds */
1175 add_common(&req_buf, common);
685fbd32 1176
ba95710a 1177 /* Add initial haves */
ec062838 1178 ret = add_haves(negotiator, &req_buf, haves_to_send, in_vain);
ba95710a 1179 }
685fbd32
BW
1180
1181 /* Send request */
1182 packet_buf_flush(&req_buf);
37c80012
JK
1183 if (write_in_full(fd_out, req_buf.buf, req_buf.len) < 0)
1184 die_errno(_("unable to write request to remote"));
685fbd32
BW
1185
1186 strbuf_release(&req_buf);
1187 return ret;
1188}
1189
1190/*
1191 * Processes a section header in a server's response and checks if it matches
1192 * `section`. If the value of `peek` is 1, the header line will be peeked (and
1193 * not consumed); if 0, the line will be consumed and the function will die if
1194 * the section header doesn't match what was expected.
1195 */
1196static int process_section_header(struct packet_reader *reader,
1197 const char *section, int peek)
1198{
1199 int ret;
1200
1201 if (packet_reader_peek(reader) != PACKET_READ_NORMAL)
bbb19a8b 1202 die(_("error reading section header '%s'"), section);
685fbd32
BW
1203
1204 ret = !strcmp(reader->line, section);
1205
1206 if (!peek) {
1207 if (!ret)
bbb19a8b 1208 die(_("expected '%s', received '%s'"),
685fbd32
BW
1209 section, reader->line);
1210 packet_reader_read(reader);
1211 }
1212
1213 return ret;
1214}
1215
ec062838 1216static int process_acks(struct fetch_negotiator *negotiator,
d30fe89c
JT
1217 struct packet_reader *reader,
1218 struct oidset *common)
685fbd32
BW
1219{
1220 /* received */
1221 int received_ready = 0;
1222 int received_ack = 0;
1223
1224 process_section_header(reader, "acknowledgments", 0);
1225 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
1226 const char *arg;
1227
1228 if (!strcmp(reader->line, "NAK"))
1229 continue;
1230
1231 if (skip_prefix(reader->line, "ACK ", &arg)) {
1232 struct object_id oid;
1233 if (!get_oid_hex(arg, &oid)) {
1234 struct commit *commit;
1235 oidset_insert(common, &oid);
c1f5eb49 1236 commit = lookup_commit(the_repository, &oid);
ec062838 1237 negotiator->ack(negotiator, commit);
685fbd32
BW
1238 }
1239 continue;
1240 }
1241
1242 if (!strcmp(reader->line, "ready")) {
685fbd32
BW
1243 received_ready = 1;
1244 continue;
1245 }
1246
bbb19a8b 1247 die(_("unexpected acknowledgment line: '%s'"), reader->line);
685fbd32
BW
1248 }
1249
1250 if (reader->status != PACKET_READ_FLUSH &&
1251 reader->status != PACKET_READ_DELIM)
bbb19a8b 1252 die(_("error processing acks: %d"), reader->status);
685fbd32 1253
5400b2a2
JT
1254 /*
1255 * If an "acknowledgments" section is sent, a packfile is sent if and
1256 * only if "ready" was sent in this section. The other sections
1257 * ("shallow-info" and "wanted-refs") are sent only if a packfile is
1258 * sent. Therefore, a DELIM is expected if "ready" is sent, and a FLUSH
1259 * otherwise.
1260 */
1261 if (received_ready && reader->status != PACKET_READ_DELIM)
1262 die(_("expected packfile to be sent after 'ready'"));
1263 if (!received_ready && reader->status != PACKET_READ_FLUSH)
1264 die(_("expected no other sections to be sent after no 'ready'"));
1265
685fbd32
BW
1266 /* return 0 if no common, 1 if there are common, or 2 if ready */
1267 return received_ready ? 2 : (received_ack ? 1 : 0);
1268}
1269
f7e20501 1270static void receive_shallow_info(struct fetch_pack_args *args,
1339078f
JT
1271 struct packet_reader *reader,
1272 struct oid_array *shallows,
1273 struct shallow_info *si)
f7e20501 1274{
1339078f 1275 int unshallow_received = 0;
bd0b42ae 1276
f7e20501
BW
1277 process_section_header(reader, "shallow-info", 0);
1278 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
1279 const char *arg;
1280 struct object_id oid;
1281
1282 if (skip_prefix(reader->line, "shallow ", &arg)) {
1283 if (get_oid_hex(arg, &oid))
1284 die(_("invalid shallow line: %s"), reader->line);
1339078f 1285 oid_array_append(shallows, &oid);
f7e20501
BW
1286 continue;
1287 }
1288 if (skip_prefix(reader->line, "unshallow ", &arg)) {
1289 if (get_oid_hex(arg, &oid))
1290 die(_("invalid unshallow line: %s"), reader->line);
d0229abd 1291 if (!lookup_object(the_repository, &oid))
f7e20501
BW
1292 die(_("object not found: %s"), reader->line);
1293 /* make sure that it is parsed as shallow */
109cd76d 1294 if (!parse_object(the_repository, &oid))
f7e20501
BW
1295 die(_("error in object: %s"), reader->line);
1296 if (unregister_shallow(&oid))
1297 die(_("no shallow found: %s"), reader->line);
1339078f 1298 unshallow_received = 1;
f7e20501
BW
1299 continue;
1300 }
1301 die(_("expected shallow/unshallow, got %s"), reader->line);
1302 }
1303
1304 if (reader->status != PACKET_READ_FLUSH &&
1305 reader->status != PACKET_READ_DELIM)
bbb19a8b 1306 die(_("error processing shallow info: %d"), reader->status);
f7e20501 1307
1339078f
JT
1308 if (args->deepen || unshallow_received) {
1309 /*
1310 * Treat these as shallow lines caused by our depth settings.
1311 * In v0, these lines cannot cause refs to be rejected; do the
1312 * same.
1313 */
1314 int i;
1315
1316 for (i = 0; i < shallows->nr; i++)
1317 register_shallow(the_repository, &shallows->oid[i]);
bd0b42ae
JT
1318 setup_alternate_shallow(&shallow_lock, &alternate_shallow_file,
1319 NULL);
1320 args->deepen = 1;
1339078f
JT
1321 } else if (shallows->nr) {
1322 /*
1323 * Treat these as shallow lines caused by the remote being
1324 * shallow. In v0, remote refs that reach these objects are
1325 * rejected (unless --update-shallow is set); do the same.
1326 */
1327 prepare_shallow_info(si, shallows);
1328 if (si->nr_ours || si->nr_theirs)
1329 alternate_shallow_file =
1330 setup_temporary_shallow(si->shallow);
1331 else
1332 alternate_shallow_file = NULL;
380ebab2 1333 } else {
1334 alternate_shallow_file = NULL;
bd0b42ae 1335 }
f7e20501
BW
1336}
1337
b7643009
JT
1338static int cmp_name_ref(const void *name, const void *ref)
1339{
1340 return strcmp(name, (*(struct ref **)ref)->name);
1341}
1342
e2842b39
JT
1343static void receive_wanted_refs(struct packet_reader *reader,
1344 struct ref **sought, int nr_sought)
73302051
BW
1345{
1346 process_section_header(reader, "wanted-refs", 0);
1347 while (packet_reader_read(reader) == PACKET_READ_NORMAL) {
1348 struct object_id oid;
1349 const char *end;
b7643009 1350 struct ref **found;
73302051
BW
1351
1352 if (parse_oid_hex(reader->line, &oid, &end) || *end++ != ' ')
bbb19a8b 1353 die(_("expected wanted-ref, got '%s'"), reader->line);
73302051 1354
b7643009
JT
1355 found = bsearch(end, sought, nr_sought, sizeof(*sought),
1356 cmp_name_ref);
1357 if (!found)
bbb19a8b 1358 die(_("unexpected wanted-ref: '%s'"), reader->line);
b7643009 1359 oidcpy(&(*found)->old_oid, &oid);
73302051
BW
1360 }
1361
1362 if (reader->status != PACKET_READ_DELIM)
bbb19a8b 1363 die(_("error processing wanted refs: %d"), reader->status);
73302051
BW
1364}
1365
685fbd32
BW
1366enum fetch_state {
1367 FETCH_CHECK_LOCAL = 0,
1368 FETCH_SEND_REQUEST,
1369 FETCH_PROCESS_ACKS,
1370 FETCH_GET_PACK,
1371 FETCH_DONE,
1372};
1373
1374static struct ref *do_fetch_pack_v2(struct fetch_pack_args *args,
1375 int fd[2],
1376 const struct ref *orig_ref,
1377 struct ref **sought, int nr_sought,
1339078f
JT
1378 struct oid_array *shallows,
1379 struct shallow_info *si,
685fbd32
BW
1380 char **pack_lockfile)
1381{
1382 struct ref *ref = copy_ref_list(orig_ref);
1383 enum fetch_state state = FETCH_CHECK_LOCAL;
1384 struct oidset common = OIDSET_INIT;
1385 struct packet_reader reader;
1386 int in_vain = 0;
1387 int haves_to_send = INITIAL_FLUSH;
ec062838 1388 struct fetch_negotiator negotiator;
42cc7485 1389 fetch_negotiator_init(&negotiator, negotiation_algorithm);
685fbd32 1390 packet_reader_init(&reader, fd[0], NULL, 0,
2d103c31
MS
1391 PACKET_READ_CHOMP_NEWLINE |
1392 PACKET_READ_DIE_ON_ERR_PACKET);
07c3c2aa
JT
1393 if (git_env_bool("GIT_TEST_SIDEBAND_ALL", 1) &&
1394 server_supports_feature("fetch", "sideband-all", 0)) {
0bbc0bc5
JT
1395 reader.use_sideband = 1;
1396 reader.me = "fetch-pack";
1397 }
685fbd32
BW
1398
1399 while (state != FETCH_DONE) {
1400 switch (state) {
1401 case FETCH_CHECK_LOCAL:
1402 sort_ref_list(&ref, ref_compare_name);
1403 QSORT(sought, nr_sought, cmp_ref_by_name);
1404
1405 /* v2 supports these by default */
1406 allow_unadvertised_object_request |= ALLOW_REACHABLE_SHA1;
1407 use_sideband = 2;
f7e20501
BW
1408 if (args->depth > 0 || args->deepen_since || args->deepen_not)
1409 args->deepen = 1;
685fbd32 1410
685fbd32 1411 /* Filter 'ref' by 'sought' and those that aren't local */
12f19a98
JT
1412 if (!args->no_dependents) {
1413 mark_complete_and_common_ref(&negotiator, args, &ref);
1414 filter_refs(args, &ref, sought, nr_sought);
1415 if (everything_local(args, &ref))
1416 state = FETCH_DONE;
1417 else
1418 state = FETCH_SEND_REQUEST;
1419
1420 mark_tips(&negotiator, args->negotiation_tips);
1421 for_each_cached_alternate(&negotiator,
1422 insert_one_alternate_object);
1423 } else {
1424 filter_refs(args, &ref, sought, nr_sought);
685fbd32 1425 state = FETCH_SEND_REQUEST;
12f19a98 1426 }
685fbd32
BW
1427 break;
1428 case FETCH_SEND_REQUEST:
ec062838
JT
1429 if (send_fetch_request(&negotiator, fd[1], args, ref,
1430 &common,
0bbc0bc5
JT
1431 &haves_to_send, &in_vain,
1432 reader.use_sideband))
685fbd32
BW
1433 state = FETCH_GET_PACK;
1434 else
1435 state = FETCH_PROCESS_ACKS;
1436 break;
1437 case FETCH_PROCESS_ACKS:
1438 /* Process ACKs/NAKs */
ec062838 1439 switch (process_acks(&negotiator, &reader, &common)) {
685fbd32
BW
1440 case 2:
1441 state = FETCH_GET_PACK;
1442 break;
1443 case 1:
1444 in_vain = 0;
1445 /* fallthrough */
1446 default:
1447 state = FETCH_SEND_REQUEST;
1448 break;
1449 }
1450 break;
1451 case FETCH_GET_PACK:
f7e20501
BW
1452 /* Check for shallow-info section */
1453 if (process_section_header(&reader, "shallow-info", 1))
1339078f 1454 receive_shallow_info(args, &reader, shallows, si);
f7e20501 1455
73302051 1456 if (process_section_header(&reader, "wanted-refs", 1))
e2842b39 1457 receive_wanted_refs(&reader, sought, nr_sought);
73302051 1458
685fbd32
BW
1459 /* get the pack */
1460 process_section_header(&reader, "packfile", 0);
1461 if (get_pack(args, fd, pack_lockfile))
1462 die(_("git fetch-pack: fetch failed."));
1463
1464 state = FETCH_DONE;
1465 break;
1466 case FETCH_DONE:
1467 continue;
1468 }
1469 }
1470
ec062838 1471 negotiator.release(&negotiator);
685fbd32
BW
1472 oidset_clear(&common);
1473 return ref;
1474}
1475
1362df0d
ÆAB
1476static int fetch_pack_config_cb(const char *var, const char *value, void *cb)
1477{
1478 if (strcmp(var, "fetch.fsck.skiplist") == 0) {
1479 const char *path;
1480
1481 if (git_config_pathname(&path, var, value))
1482 return 1;
1483 strbuf_addf(&fsck_msg_types, "%cskiplist=%s",
1484 fsck_msg_types.len ? ',' : '=', path);
1485 free((char *)path);
1486 return 0;
1487 }
1488
1489 if (skip_prefix(var, "fetch.fsck.", &var)) {
1490 if (is_valid_msg_type(var, value))
1491 strbuf_addf(&fsck_msg_types, "%c%s=%s",
1492 fsck_msg_types.len ? ',' : '=', var, value);
1493 else
1494 warning("Skipping unknown msg id '%s'", var);
1495 return 0;
1496 }
1497
1498 return git_default_config(var, value, cb);
1499}
1500
f44af51d 1501static void fetch_pack_config(void)
745f7a8c 1502{
f44af51d
TA
1503 git_config_get_int("fetch.unpacklimit", &fetch_unpack_limit);
1504 git_config_get_int("transfer.unpacklimit", &transfer_unpack_limit);
1505 git_config_get_bool("repack.usedeltabaseoffset", &prefer_ofs_delta);
1506 git_config_get_bool("fetch.fsckobjects", &fetch_fsck_objects);
1507 git_config_get_bool("transfer.fsckobjects", &transfer_fsck_objects);
42cc7485
JT
1508 git_config_get_string("fetch.negotiationalgorithm",
1509 &negotiation_algorithm);
745f7a8c 1510
1362df0d 1511 git_config(fetch_pack_config_cb, NULL);
745f7a8c
NTND
1512}
1513
745f7a8c
NTND
1514static void fetch_pack_setup(void)
1515{
1516 static int did_setup;
1517 if (did_setup)
1518 return;
f44af51d 1519 fetch_pack_config();
745f7a8c
NTND
1520 if (0 <= transfer_unpack_limit)
1521 unpack_limit = transfer_unpack_limit;
1522 else if (0 <= fetch_unpack_limit)
1523 unpack_limit = fetch_unpack_limit;
1524 did_setup = 1;
1525}
1526
f2db854d
JH
1527static int remove_duplicates_in_refs(struct ref **ref, int nr)
1528{
1529 struct string_list names = STRING_LIST_INIT_NODUP;
1530 int src, dst;
1531
1532 for (src = dst = 0; src < nr; src++) {
1533 struct string_list_item *item;
1534 item = string_list_insert(&names, ref[src]->name);
1535 if (item->util)
1536 continue; /* already have it */
1537 item->util = ref[src];
1538 if (src != dst)
1539 ref[dst] = ref[src];
1540 dst++;
1541 }
1542 for (src = dst; src < nr; src++)
1543 ref[src] = NULL;
1544 string_list_clear(&names, 0);
1545 return dst;
1546}
1547
beea4152 1548static void update_shallow(struct fetch_pack_args *args,
e2842b39 1549 struct ref **sought, int nr_sought,
beea4152 1550 struct shallow_info *si)
a796ccee 1551{
910650d2 1552 struct oid_array ref = OID_ARRAY_INIT;
4820a33b 1553 int *status;
beea4152
NTND
1554 int i;
1555
79891cb9 1556 if (args->deepen && alternate_shallow_file) {
a796ccee 1557 if (*alternate_shallow_file == '\0') { /* --unshallow */
102de880 1558 unlink_or_warn(git_path_shallow(the_repository));
a796ccee
NTND
1559 rollback_lock_file(&shallow_lock);
1560 } else
1561 commit_lock_file(&shallow_lock);
23311f35 1562 alternate_shallow_file = NULL;
a796ccee
NTND
1563 return;
1564 }
beea4152
NTND
1565
1566 if (!si->shallow || !si->shallow->nr)
1567 return;
1568
beea4152
NTND
1569 if (args->cloning) {
1570 /*
1571 * remote is shallow, but this is a clone, there are
1572 * no objects in repo to worry about. Accept any
1573 * shallow points that exist in the pack (iow in repo
1574 * after get_pack() and reprepare_packed_git())
1575 */
910650d2 1576 struct oid_array extra = OID_ARRAY_INIT;
ee3051bd 1577 struct object_id *oid = si->shallow->oid;
beea4152 1578 for (i = 0; i < si->shallow->nr; i++)
ee3051bd 1579 if (has_object_file(&oid[i]))
910650d2 1580 oid_array_append(&extra, &oid[i]);
beea4152
NTND
1581 if (extra.nr) {
1582 setup_alternate_shallow(&shallow_lock,
1583 &alternate_shallow_file,
1584 &extra);
1585 commit_lock_file(&shallow_lock);
23311f35 1586 alternate_shallow_file = NULL;
beea4152 1587 }
910650d2 1588 oid_array_clear(&extra);
beea4152
NTND
1589 return;
1590 }
4820a33b
NTND
1591
1592 if (!si->nr_ours && !si->nr_theirs)
1593 return;
1594
1595 remove_nonexistent_theirs_shallow(si);
4820a33b
NTND
1596 if (!si->nr_ours && !si->nr_theirs)
1597 return;
e2842b39
JT
1598 for (i = 0; i < nr_sought; i++)
1599 oid_array_append(&ref, &sought[i]->old_oid);
4820a33b
NTND
1600 si->ref = &ref;
1601
48d25cae
NTND
1602 if (args->update_shallow) {
1603 /*
1604 * remote is also shallow, .git/shallow may be updated
1605 * so all refs can be accepted. Make sure we only add
1606 * shallow roots that are actually reachable from new
1607 * refs.
1608 */
910650d2 1609 struct oid_array extra = OID_ARRAY_INIT;
ee3051bd 1610 struct object_id *oid = si->shallow->oid;
48d25cae
NTND
1611 assign_shallow_commits_to_refs(si, NULL, NULL);
1612 if (!si->nr_ours && !si->nr_theirs) {
910650d2 1613 oid_array_clear(&ref);
48d25cae
NTND
1614 return;
1615 }
1616 for (i = 0; i < si->nr_ours; i++)
910650d2 1617 oid_array_append(&extra, &oid[si->ours[i]]);
48d25cae 1618 for (i = 0; i < si->nr_theirs; i++)
910650d2 1619 oid_array_append(&extra, &oid[si->theirs[i]]);
48d25cae
NTND
1620 setup_alternate_shallow(&shallow_lock,
1621 &alternate_shallow_file,
1622 &extra);
1623 commit_lock_file(&shallow_lock);
910650d2 1624 oid_array_clear(&extra);
1625 oid_array_clear(&ref);
23311f35 1626 alternate_shallow_file = NULL;
48d25cae
NTND
1627 return;
1628 }
1629
4820a33b
NTND
1630 /*
1631 * remote is also shallow, check what ref is safe to update
1632 * without updating .git/shallow
1633 */
e2842b39 1634 status = xcalloc(nr_sought, sizeof(*status));
4820a33b
NTND
1635 assign_shallow_commits_to_refs(si, NULL, status);
1636 if (si->nr_ours || si->nr_theirs) {
e2842b39 1637 for (i = 0; i < nr_sought; i++)
4820a33b 1638 if (status[i])
e2842b39 1639 sought[i]->status = REF_STATUS_REJECT_SHALLOW;
4820a33b
NTND
1640 }
1641 free(status);
910650d2 1642 oid_array_clear(&ref);
a796ccee
NTND
1643}
1644
cf1e7c07
JT
1645static int iterate_ref_map(void *cb_data, struct object_id *oid)
1646{
1647 struct ref **rm = cb_data;
1648 struct ref *ref = *rm;
1649
1650 if (!ref)
1651 return -1; /* end of the list */
1652 *rm = ref->next;
1653 oidcpy(oid, &ref->old_oid);
1654 return 0;
1655}
1656
745f7a8c 1657struct ref *fetch_pack(struct fetch_pack_args *args,
0f804b0b 1658 int fd[],
745f7a8c 1659 const struct ref *ref,
f2db854d 1660 struct ref **sought, int nr_sought,
910650d2 1661 struct oid_array *shallow,
685fbd32
BW
1662 char **pack_lockfile,
1663 enum protocol_version version)
745f7a8c 1664{
745f7a8c 1665 struct ref *ref_cpy;
beea4152 1666 struct shallow_info si;
1339078f 1667 struct oid_array shallows_scratch = OID_ARRAY_INIT;
745f7a8c
NTND
1668
1669 fetch_pack_setup();
f2db854d
JH
1670 if (nr_sought)
1671 nr_sought = remove_duplicates_in_refs(sought, nr_sought);
745f7a8c 1672
4c7f9567
JT
1673 if (args->no_dependents && !args->filter_options.choice) {
1674 /*
1675 * The protocol does not support requesting that only the
1676 * wanted objects be sent, so approximate this by setting a
1677 * "blob:none" filter if no filter is already set. This works
1678 * for all object types: note that wanted blobs will still be
1679 * sent because they are directly specified as a "want".
1680 *
1681 * NEEDSWORK: Add an option in the protocol to request that
1682 * only the wanted objects be sent, and implement it.
1683 */
1684 parse_list_objects_filter(&args->filter_options, "blob:none");
1685 }
1686
01775651 1687 if (version != protocol_v2 && !ref) {
745f7a8c 1688 packet_flush(fd[1]);
1dd73e20 1689 die(_("no matching remote head"));
745f7a8c 1690 }
1e7d440b
JT
1691 if (version == protocol_v2) {
1692 if (shallow->nr)
1693 BUG("Protocol V2 does not provide shallows at this point in the fetch");
1694 memset(&si, 0, sizeof(si));
685fbd32 1695 ref_cpy = do_fetch_pack_v2(args, fd, ref, sought, nr_sought,
1339078f 1696 &shallows_scratch, &si,
685fbd32 1697 pack_lockfile);
1e7d440b
JT
1698 } else {
1699 prepare_shallow_info(&si, shallow);
685fbd32
BW
1700 ref_cpy = do_fetch_pack(args, fd, ref, sought, nr_sought,
1701 &si, pack_lockfile);
1e7d440b 1702 }
a49d2834 1703 reprepare_packed_git(the_repository);
cf1e7c07
JT
1704
1705 if (!args->cloning && args->deepen) {
1706 struct check_connected_options opt = CHECK_CONNECTED_INIT;
1707 struct ref *iterator = ref_cpy;
1708 opt.shallow_file = alternate_shallow_file;
1709 if (args->deepen)
1710 opt.is_deepening_fetch = 1;
1711 if (check_connected(iterate_ref_map, &iterator, &opt)) {
1712 error(_("remote did not send all necessary objects"));
1713 free_refs(ref_cpy);
1714 ref_cpy = NULL;
1715 rollback_lock_file(&shallow_lock);
1716 goto cleanup;
1717 }
1718 args->connectivity_checked = 1;
1719 }
1720
e2842b39 1721 update_shallow(args, sought, nr_sought, &si);
cf1e7c07 1722cleanup:
beea4152 1723 clear_shallow_info(&si);
1339078f 1724 oid_array_clear(&shallows_scratch);
745f7a8c
NTND
1725 return ref_cpy;
1726}
e860d96b
MM
1727
1728int report_unmatched_refs(struct ref **sought, int nr_sought)
1729{
1730 int i, ret = 0;
1731
1732 for (i = 0; i < nr_sought; i++) {
d56583de 1733 if (!sought[i])
e860d96b 1734 continue;
d56583de
MM
1735 switch (sought[i]->match_status) {
1736 case REF_MATCHED:
1737 continue;
1738 case REF_NOT_MATCHED:
1739 error(_("no such remote ref %s"), sought[i]->name);
1740 break;
1741 case REF_UNADVERTISED_NOT_ALLOWED:
1742 error(_("Server does not allow request for unadvertised object %s"),
1743 sought[i]->name);
1744 break;
1745 }
e860d96b
MM
1746 ret = 1;
1747 }
1748 return ret;
1749}