shallow.c: stop abusing COMMIT_SLAB_SIZE for paint_info's memory pools
[git/git.git] / shallow.c
CommitLineData
ed09aef0 1#include "cache.h"
6e122b44 2#include "tempfile.h"
697cc8ef 3#include "lockfile.h"
ed09aef0 4#include "commit.h"
abef3a16 5#include "tag.h"
3125fe52 6#include "pkt-line.h"
58babfff
NTND
7#include "remote.h"
8#include "refs.h"
9#include "sha1-array.h"
10#include "diff.h"
11#include "revision.h"
12#include "commit-slab.h"
ed09aef0
JS
13
14static int is_shallow = -1;
0cc77c38 15static struct stat_validity shallow_stat;
6035d6aa
NTND
16static char *alternate_shallow_file;
17
069c0532 18void set_alternate_shallow_file(const char *path, int override)
6035d6aa
NTND
19{
20 if (is_shallow != -1)
21 die("BUG: is_repository_shallow must not be called before set_alternate_shallow_file");
069c0532
NTND
22 if (alternate_shallow_file && !override)
23 return;
6035d6aa 24 free(alternate_shallow_file);
8c53f071 25 alternate_shallow_file = xstrdup_or_null(path);
6035d6aa 26}
ed09aef0
JS
27
28int register_shallow(const unsigned char *sha1)
29{
30 struct commit_graft *graft =
31 xmalloc(sizeof(struct commit_graft));
32 struct commit *commit = lookup_commit(sha1);
33
7683e2e6 34 hashcpy(graft->oid.hash, sha1);
ed09aef0
JS
35 graft->nr_parent = -1;
36 if (commit && commit->object.parsed)
37 commit->parents = NULL;
38 return register_commit_graft(graft, 0);
39}
40
f43117a6 41int is_repository_shallow(void)
ed09aef0
JS
42{
43 FILE *fp;
44 char buf[1024];
6035d6aa 45 const char *path = alternate_shallow_file;
ed09aef0
JS
46
47 if (is_shallow >= 0)
48 return is_shallow;
49
6035d6aa 50 if (!path)
f932729c 51 path = git_path_shallow();
6035d6aa
NTND
52 /*
53 * fetch-pack sets '--shallow-file ""' as an indicator that no
54 * shallow file should be used. We could just open it and it
55 * will likely fail. But let's do an explicit check instead.
56 */
0cc77c38
JK
57 if (!*path || (fp = fopen(path, "r")) == NULL) {
58 stat_validity_clear(&shallow_stat);
ed09aef0
JS
59 is_shallow = 0;
60 return is_shallow;
61 }
0cc77c38 62 stat_validity_update(&shallow_stat, fileno(fp));
ed09aef0
JS
63 is_shallow = 1;
64
65 while (fgets(buf, sizeof(buf), fp)) {
66 unsigned char sha1[20];
67 if (get_sha1_hex(buf, sha1))
68 die("bad shallow line: %s", buf);
69 register_shallow(sha1);
70 }
71 fclose(fp);
72 return is_shallow;
73}
74
f53514bc
JS
75struct commit_list *get_shallow_commits(struct object_array *heads, int depth,
76 int shallow_flag, int not_shallow_flag)
ed09aef0
JS
77{
78 int i = 0, cur_depth = 0;
79 struct commit_list *result = NULL;
3cd47459 80 struct object_array stack = OBJECT_ARRAY_INIT;
ed09aef0 81 struct commit *commit = NULL;
79d3a236 82 struct commit_graft *graft;
ed09aef0
JS
83
84 while (commit || i < heads->nr || stack.nr) {
85 struct commit_list *p;
86 if (!commit) {
87 if (i < heads->nr) {
88 commit = (struct commit *)
abef3a16 89 deref_tag(heads->objects[i++].item, NULL, 0);
affeef12 90 if (!commit || commit->object.type != OBJ_COMMIT) {
ed09aef0
JS
91 commit = NULL;
92 continue;
93 }
d64d6c9f
AJ
94 if (!commit->util)
95 commit->util = xmalloc(sizeof(int));
96 *(int *)commit->util = 0;
ed09aef0
JS
97 cur_depth = 0;
98 } else {
99 commit = (struct commit *)
100 stack.objects[--stack.nr].item;
101 cur_depth = *(int *)commit->util;
102 }
103 }
367068e0 104 parse_commit_or_die(commit);
ed09aef0 105 cur_depth++;
79d3a236
NTND
106 if ((depth != INFINITE_DEPTH && cur_depth >= depth) ||
107 (is_repository_shallow() && !commit->parents &&
ed1c9977 108 (graft = lookup_commit_graft(commit->object.oid.hash)) != NULL &&
79d3a236 109 graft->nr_parent < 0)) {
682c7d2f
NTND
110 commit_list_insert(commit, &result);
111 commit->object.flags |= shallow_flag;
112 commit = NULL;
113 continue;
114 }
115 commit->object.flags |= not_shallow_flag;
ed09aef0
JS
116 for (p = commit->parents, commit = NULL; p; p = p->next) {
117 if (!p->item->util) {
118 int *pointer = xmalloc(sizeof(int));
119 p->item->util = pointer;
120 *pointer = cur_depth;
121 } else {
122 int *pointer = p->item->util;
123 if (cur_depth >= *pointer)
124 continue;
125 *pointer = cur_depth;
126 }
4b796951
MK
127 if (p->next)
128 add_object_array(&p->item->object,
129 NULL, &stack);
130 else {
131 commit = p->item;
132 cur_depth = *(int *)commit->util;
f53514bc 133 }
ed09aef0
JS
134 }
135 }
136
137 return result;
138}
6035d6aa 139
167832c2 140static void check_shallow_file_for_update(void)
6035d6aa 141{
0cc77c38 142 if (is_shallow == -1)
6035d6aa
NTND
143 die("BUG: shallow must be initialized by now");
144
f932729c 145 if (!stat_validity_check(&shallow_stat, git_path_shallow()))
0cc77c38 146 die("shallow file has changed since we read it");
6035d6aa 147}
3125fe52 148
eab3296c
NTND
149#define SEEN_ONLY 1
150#define VERBOSE 2
151
3125fe52
NTND
152struct write_shallow_data {
153 struct strbuf *out;
154 int use_pack_protocol;
155 int count;
eab3296c 156 unsigned flags;
3125fe52
NTND
157};
158
159static int write_one_shallow(const struct commit_graft *graft, void *cb_data)
160{
161 struct write_shallow_data *data = cb_data;
7683e2e6 162 const char *hex = oid_to_hex(&graft->oid);
6a3bbb4d
NTND
163 if (graft->nr_parent != -1)
164 return 0;
eab3296c 165 if (data->flags & SEEN_ONLY) {
7683e2e6 166 struct commit *c = lookup_commit(graft->oid.hash);
eab3296c
NTND
167 if (!c || !(c->object.flags & SEEN)) {
168 if (data->flags & VERBOSE)
169 printf("Removing %s from .git/shallow\n",
f2fd0760 170 oid_to_hex(&c->object.oid));
eab3296c
NTND
171 return 0;
172 }
173 }
3125fe52
NTND
174 data->count++;
175 if (data->use_pack_protocol)
176 packet_buf_write(data->out, "shallow %s", hex);
177 else {
178 strbuf_addstr(data->out, hex);
179 strbuf_addch(data->out, '\n');
180 }
181 return 0;
182}
183
eab3296c
NTND
184static int write_shallow_commits_1(struct strbuf *out, int use_pack_protocol,
185 const struct sha1_array *extra,
186 unsigned flags)
3125fe52
NTND
187{
188 struct write_shallow_data data;
1a30f5a2 189 int i;
3125fe52
NTND
190 data.out = out;
191 data.use_pack_protocol = use_pack_protocol;
192 data.count = 0;
eab3296c 193 data.flags = flags;
3125fe52 194 for_each_commit_graft(write_one_shallow, &data);
1a30f5a2
NTND
195 if (!extra)
196 return data.count;
197 for (i = 0; i < extra->nr; i++) {
198 strbuf_addstr(out, sha1_to_hex(extra->sha1[i]));
199 strbuf_addch(out, '\n');
200 data.count++;
201 }
3125fe52
NTND
202 return data.count;
203}
204
eab3296c
NTND
205int write_shallow_commits(struct strbuf *out, int use_pack_protocol,
206 const struct sha1_array *extra)
207{
208 return write_shallow_commits_1(out, use_pack_protocol, extra, 0);
209}
210
6e122b44 211static struct tempfile temporary_shallow;
0179c945
JK
212
213const char *setup_temporary_shallow(const struct sha1_array *extra)
08ea65ad
NTND
214{
215 struct strbuf sb = STRBUF_INIT;
216 int fd;
217
1a30f5a2 218 if (write_shallow_commits(&sb, 0, extra)) {
6e122b44 219 fd = xmks_tempfile(&temporary_shallow, git_path("shallow_XXXXXX"));
0179c945 220
08ea65ad
NTND
221 if (write_in_full(fd, sb.buf, sb.len) != sb.len)
222 die_errno("failed to write to %s",
6e122b44
MH
223 get_tempfile_path(&temporary_shallow));
224 close_tempfile(&temporary_shallow);
08ea65ad 225 strbuf_release(&sb);
6e122b44 226 return get_tempfile_path(&temporary_shallow);
08ea65ad
NTND
227 }
228 /*
229 * is_repository_shallow() sees empty string as "no shallow
230 * file".
231 */
6e122b44 232 return get_tempfile_path(&temporary_shallow);
08ea65ad
NTND
233}
234
3125fe52 235void setup_alternate_shallow(struct lock_file *shallow_lock,
1a30f5a2
NTND
236 const char **alternate_shallow_file,
237 const struct sha1_array *extra)
3125fe52
NTND
238{
239 struct strbuf sb = STRBUF_INIT;
240 int fd;
241
f932729c 242 fd = hold_lock_file_for_update(shallow_lock, git_path_shallow(),
3125fe52 243 LOCK_DIE_ON_ERROR);
78396321 244 check_shallow_file_for_update();
1a30f5a2 245 if (write_shallow_commits(&sb, 0, extra)) {
3125fe52
NTND
246 if (write_in_full(fd, sb.buf, sb.len) != sb.len)
247 die_errno("failed to write to %s",
b4fb09e4
MH
248 get_lock_file_path(shallow_lock));
249 *alternate_shallow_file = get_lock_file_path(shallow_lock);
3125fe52
NTND
250 } else
251 /*
252 * is_repository_shallow() sees empty string as "no
253 * shallow file".
254 */
255 *alternate_shallow_file = "";
256 strbuf_release(&sb);
257}
ad491366
NTND
258
259static int advertise_shallow_grafts_cb(const struct commit_graft *graft, void *cb)
260{
261 int fd = *(int *)cb;
262 if (graft->nr_parent == -1)
7683e2e6 263 packet_write(fd, "shallow %s\n", oid_to_hex(&graft->oid));
ad491366
NTND
264 return 0;
265}
266
267void advertise_shallow_grafts(int fd)
268{
269 if (!is_repository_shallow())
270 return;
271 for_each_commit_graft(advertise_shallow_grafts_cb, &fd);
272}
58babfff 273
eab3296c
NTND
274/*
275 * mark_reachable_objects() should have been run prior to this and all
276 * reachable commits marked as "SEEN".
277 */
278void prune_shallow(int show_only)
279{
280 static struct lock_file shallow_lock;
281 struct strbuf sb = STRBUF_INIT;
282 int fd;
283
284 if (show_only) {
285 write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY | VERBOSE);
286 strbuf_release(&sb);
287 return;
288 }
f932729c 289 fd = hold_lock_file_for_update(&shallow_lock, git_path_shallow(),
eab3296c 290 LOCK_DIE_ON_ERROR);
78396321 291 check_shallow_file_for_update();
eab3296c
NTND
292 if (write_shallow_commits_1(&sb, 0, NULL, SEEN_ONLY)) {
293 if (write_in_full(fd, sb.buf, sb.len) != sb.len)
294 die_errno("failed to write to %s",
b4fb09e4 295 get_lock_file_path(&shallow_lock));
eab3296c
NTND
296 commit_lock_file(&shallow_lock);
297 } else {
f932729c 298 unlink(git_path_shallow());
eab3296c
NTND
299 rollback_lock_file(&shallow_lock);
300 }
301 strbuf_release(&sb);
302}
303
6aa30857 304struct trace_key trace_shallow = TRACE_KEY_INIT(SHALLOW);
58babfff
NTND
305
306/*
307 * Step 1, split sender shallow commits into "ours" and "theirs"
308 * Step 2, clean "ours" based on .git/shallow
309 */
310void prepare_shallow_info(struct shallow_info *info, struct sha1_array *sa)
311{
312 int i;
6aa30857 313 trace_printf_key(&trace_shallow, "shallow: prepare_shallow_info\n");
58babfff
NTND
314 memset(info, 0, sizeof(*info));
315 info->shallow = sa;
316 if (!sa)
317 return;
b32fa95f
JK
318 ALLOC_ARRAY(info->ours, sa->nr);
319 ALLOC_ARRAY(info->theirs, sa->nr);
58babfff
NTND
320 for (i = 0; i < sa->nr; i++) {
321 if (has_sha1_file(sa->sha1[i])) {
322 struct commit_graft *graft;
323 graft = lookup_commit_graft(sa->sha1[i]);
324 if (graft && graft->nr_parent < 0)
325 continue;
326 info->ours[info->nr_ours++] = i;
327 } else
328 info->theirs[info->nr_theirs++] = i;
329 }
330}
331
332void clear_shallow_info(struct shallow_info *info)
333{
334 free(info->ours);
335 free(info->theirs);
336}
337
338/* Step 4, remove non-existent ones in "theirs" after getting the pack */
339
340void remove_nonexistent_theirs_shallow(struct shallow_info *info)
341{
342 unsigned char (*sha1)[20] = info->shallow->sha1;
343 int i, dst;
6aa30857 344 trace_printf_key(&trace_shallow, "shallow: remove_nonexistent_theirs_shallow\n");
58babfff
NTND
345 for (i = dst = 0; i < info->nr_theirs; i++) {
346 if (i != dst)
347 info->theirs[dst] = info->theirs[i];
348 if (has_sha1_file(sha1[info->theirs[i]]))
349 dst++;
350 }
351 info->nr_theirs = dst;
352}
353
8e277383
NTND
354define_commit_slab(ref_bitmap, uint32_t *);
355
6bc3d8c5
NTND
356#define POOL_SIZE (512 * 1024)
357
8e277383
NTND
358struct paint_info {
359 struct ref_bitmap ref_bitmap;
360 unsigned nr_bits;
0afd307a 361 char **pools;
8e277383 362 char *free, *end;
0afd307a 363 unsigned pool_count;
8e277383
NTND
364};
365
366static uint32_t *paint_alloc(struct paint_info *info)
367{
368 unsigned nr = (info->nr_bits + 31) / 32;
369 unsigned size = nr * sizeof(uint32_t);
370 void *p;
0afd307a
NTND
371 if (!info->pool_count || info->free + size > info->end) {
372 info->pool_count++;
373 REALLOC_ARRAY(info->pools, info->pool_count);
6bc3d8c5 374 info->free = xmalloc(POOL_SIZE);
0afd307a 375 info->pools[info->pool_count - 1] = info->free;
6bc3d8c5 376 info->end = info->free + POOL_SIZE;
8e277383
NTND
377 }
378 p = info->free;
379 info->free += size;
380 return p;
381}
382
383/*
384 * Given a commit SHA-1, walk down to parents until either SEEN,
385 * UNINTERESTING or BOTTOM is hit. Set the id-th bit in ref_bitmap for
386 * all walked commits.
387 */
388static void paint_down(struct paint_info *info, const unsigned char *sha1,
389 int id)
390{
391 unsigned int i, nr;
392 struct commit_list *head = NULL;
393 int bitmap_nr = (info->nr_bits + 31) / 32;
50a6c8ef 394 size_t bitmap_size = st_mult(bitmap_nr, sizeof(uint32_t));
8e277383
NTND
395 uint32_t *tmp = xmalloc(bitmap_size); /* to be freed before return */
396 uint32_t *bitmap = paint_alloc(info);
397 struct commit *c = lookup_commit_reference_gently(sha1, 1);
398 if (!c)
399 return;
400 memset(bitmap, 0, bitmap_size);
401 bitmap[id / 32] |= (1 << (id % 32));
402 commit_list_insert(c, &head);
403 while (head) {
404 struct commit_list *p;
e510ab89 405 struct commit *c = pop_commit(&head);
8e277383
NTND
406 uint32_t **refs = ref_bitmap_at(&info->ref_bitmap, c);
407
8e277383
NTND
408 /* XXX check "UNINTERESTING" from pack bitmaps if available */
409 if (c->object.flags & (SEEN | UNINTERESTING))
410 continue;
411 else
412 c->object.flags |= SEEN;
413
414 if (*refs == NULL)
415 *refs = bitmap;
416 else {
417 memcpy(tmp, *refs, bitmap_size);
418 for (i = 0; i < bitmap_nr; i++)
419 tmp[i] |= bitmap[i];
420 if (memcmp(tmp, *refs, bitmap_size)) {
421 *refs = paint_alloc(info);
422 memcpy(*refs, tmp, bitmap_size);
423 }
424 }
425
426 if (c->object.flags & BOTTOM)
427 continue;
428
429 if (parse_commit(c))
430 die("unable to parse commit %s",
f2fd0760 431 oid_to_hex(&c->object.oid));
8e277383
NTND
432
433 for (p = c->parents; p; p = p->next) {
434 uint32_t **p_refs = ref_bitmap_at(&info->ref_bitmap,
435 p->item);
436 if (p->item->object.flags & SEEN)
437 continue;
438 if (*p_refs == NULL || *p_refs == *refs)
439 *p_refs = *refs;
440 commit_list_insert(p->item, &head);
441 }
442 }
443
444 nr = get_max_object_index();
445 for (i = 0; i < nr; i++) {
446 struct object *o = get_indexed_object(i);
447 if (o && o->type == OBJ_COMMIT)
448 o->flags &= ~SEEN;
449 }
450
451 free(tmp);
452}
453
580b04ef 454static int mark_uninteresting(const char *refname, const struct object_id *oid,
8e277383
NTND
455 int flags, void *cb_data)
456{
580b04ef 457 struct commit *commit = lookup_commit_reference_gently(oid->hash, 1);
8e277383
NTND
458 if (!commit)
459 return 0;
460 commit->object.flags |= UNINTERESTING;
461 mark_parents_uninteresting(commit);
462 return 0;
463}
464
465static void post_assign_shallow(struct shallow_info *info,
466 struct ref_bitmap *ref_bitmap,
467 int *ref_status);
468/*
469 * Step 6(+7), associate shallow commits with new refs
470 *
471 * info->ref must be initialized before calling this function.
472 *
473 * If used is not NULL, it's an array of info->shallow->nr
474 * bitmaps. The n-th bit set in the m-th bitmap if ref[n] needs the
475 * m-th shallow commit from info->shallow.
476 *
477 * If used is NULL, "ours" and "theirs" are updated. And if ref_status
478 * is not NULL it's an array of ref->nr ints. ref_status[i] is true if
479 * the ref needs some shallow commits from either info->ours or
480 * info->theirs.
481 */
482void assign_shallow_commits_to_refs(struct shallow_info *info,
483 uint32_t **used, int *ref_status)
484{
485 unsigned char (*sha1)[20] = info->shallow->sha1;
486 struct sha1_array *ref = info->ref;
487 unsigned int i, nr;
488 int *shallow, nr_shallow = 0;
489 struct paint_info pi;
490
6aa30857 491 trace_printf_key(&trace_shallow, "shallow: assign_shallow_commits_to_refs\n");
b32fa95f 492 ALLOC_ARRAY(shallow, info->nr_ours + info->nr_theirs);
8e277383
NTND
493 for (i = 0; i < info->nr_ours; i++)
494 shallow[nr_shallow++] = info->ours[i];
495 for (i = 0; i < info->nr_theirs; i++)
496 shallow[nr_shallow++] = info->theirs[i];
497
498 /*
499 * Prepare the commit graph to track what refs can reach what
500 * (new) shallow commits.
501 */
502 nr = get_max_object_index();
503 for (i = 0; i < nr; i++) {
504 struct object *o = get_indexed_object(i);
505 if (!o || o->type != OBJ_COMMIT)
506 continue;
507
508 o->flags &= ~(UNINTERESTING | BOTTOM | SEEN);
509 }
510
511 memset(&pi, 0, sizeof(pi));
512 init_ref_bitmap(&pi.ref_bitmap);
513 pi.nr_bits = ref->nr;
514
515 /*
516 * "--not --all" to cut short the traversal if new refs
517 * connect to old refs. If not (e.g. force ref updates) it'll
518 * have to go down to the current shallow commits.
519 */
580b04ef
MH
520 head_ref(mark_uninteresting, NULL);
521 for_each_ref(mark_uninteresting, NULL);
8e277383
NTND
522
523 /* Mark potential bottoms so we won't go out of bound */
524 for (i = 0; i < nr_shallow; i++) {
525 struct commit *c = lookup_commit(sha1[shallow[i]]);
526 c->object.flags |= BOTTOM;
527 }
528
529 for (i = 0; i < ref->nr; i++)
530 paint_down(&pi, ref->sha1[i], i);
531
532 if (used) {
533 int bitmap_size = ((pi.nr_bits + 31) / 32) * sizeof(uint32_t);
534 memset(used, 0, sizeof(*used) * info->shallow->nr);
535 for (i = 0; i < nr_shallow; i++) {
536 const struct commit *c = lookup_commit(sha1[shallow[i]]);
537 uint32_t **map = ref_bitmap_at(&pi.ref_bitmap, c);
538 if (*map)
539 used[shallow[i]] = xmemdupz(*map, bitmap_size);
540 }
541 /*
542 * unreachable shallow commits are not removed from
543 * "ours" and "theirs". The user is supposed to run
544 * step 7 on every ref separately and not trust "ours"
545 * and "theirs" any more.
546 */
547 } else
548 post_assign_shallow(info, &pi.ref_bitmap, ref_status);
549
550 clear_ref_bitmap(&pi.ref_bitmap);
0afd307a
NTND
551 for (i = 0; i < pi.pool_count; i++)
552 free(pi.pools[i]);
553 free(pi.pools);
8e277383
NTND
554 free(shallow);
555}
556
557struct commit_array {
558 struct commit **commits;
559 int nr, alloc;
560};
561
580b04ef
MH
562static int add_ref(const char *refname, const struct object_id *oid,
563 int flags, void *cb_data)
8e277383
NTND
564{
565 struct commit_array *ca = cb_data;
566 ALLOC_GROW(ca->commits, ca->nr + 1, ca->alloc);
580b04ef 567 ca->commits[ca->nr] = lookup_commit_reference_gently(oid->hash, 1);
8e277383
NTND
568 if (ca->commits[ca->nr])
569 ca->nr++;
570 return 0;
571}
572
573static void update_refstatus(int *ref_status, int nr, uint32_t *bitmap)
574{
575 int i;
576 if (!ref_status)
577 return;
578 for (i = 0; i < nr; i++)
579 if (bitmap[i / 32] & (1 << (i % 32)))
580 ref_status[i]++;
581}
582
583/*
584 * Step 7, reachability test on "ours" at commit level
585 */
586static void post_assign_shallow(struct shallow_info *info,
587 struct ref_bitmap *ref_bitmap,
588 int *ref_status)
589{
590 unsigned char (*sha1)[20] = info->shallow->sha1;
591 struct commit *c;
592 uint32_t **bitmap;
593 int dst, i, j;
594 int bitmap_nr = (info->ref->nr + 31) / 32;
595 struct commit_array ca;
596
6aa30857 597 trace_printf_key(&trace_shallow, "shallow: post_assign_shallow\n");
8e277383
NTND
598 if (ref_status)
599 memset(ref_status, 0, sizeof(*ref_status) * info->ref->nr);
600
601 /* Remove unreachable shallow commits from "theirs" */
602 for (i = dst = 0; i < info->nr_theirs; i++) {
603 if (i != dst)
604 info->theirs[dst] = info->theirs[i];
605 c = lookup_commit(sha1[info->theirs[i]]);
606 bitmap = ref_bitmap_at(ref_bitmap, c);
607 if (!*bitmap)
608 continue;
609 for (j = 0; j < bitmap_nr; j++)
610 if (bitmap[0][j]) {
611 update_refstatus(ref_status, info->ref->nr, *bitmap);
612 dst++;
613 break;
614 }
615 }
616 info->nr_theirs = dst;
617
618 memset(&ca, 0, sizeof(ca));
580b04ef
MH
619 head_ref(add_ref, &ca);
620 for_each_ref(add_ref, &ca);
8e277383
NTND
621
622 /* Remove unreachable shallow commits from "ours" */
623 for (i = dst = 0; i < info->nr_ours; i++) {
624 if (i != dst)
625 info->ours[dst] = info->ours[i];
626 c = lookup_commit(sha1[info->ours[i]]);
627 bitmap = ref_bitmap_at(ref_bitmap, c);
628 if (!*bitmap)
629 continue;
630 for (j = 0; j < bitmap_nr; j++)
631 if (bitmap[0][j] &&
632 /* Step 7, reachability test at commit level */
633 !in_merge_bases_many(c, ca.nr, ca.commits)) {
634 update_refstatus(ref_status, info->ref->nr, *bitmap);
635 dst++;
636 break;
637 }
638 }
639 info->nr_ours = dst;
640
641 free(ca.commits);
642}
0a1bc12b
NTND
643
644/* (Delayed) step 7, reachability test at commit level */
645int delayed_reachability_test(struct shallow_info *si, int c)
646{
647 if (si->need_reachability_test[c]) {
648 struct commit *commit = lookup_commit(si->shallow->sha1[c]);
649
650 if (!si->commits) {
651 struct commit_array ca;
2b2a5be3 652
0a1bc12b 653 memset(&ca, 0, sizeof(ca));
580b04ef
MH
654 head_ref(add_ref, &ca);
655 for_each_ref(add_ref, &ca);
0a1bc12b
NTND
656 si->commits = ca.commits;
657 si->nr_commits = ca.nr;
658 }
659
660 si->reachable[c] = in_merge_bases_many(commit,
661 si->nr_commits,
662 si->commits);
663 si->need_reachability_test[c] = 0;
664 }
665 return si->reachable[c];
666}