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