Elijah Newren | 9875058 | 2023-03-21 06:26:04 +0000 | [diff] [blame] | 1 | #include "git-compat-util.h" |
Elijah Newren | f394e09 | 2023-03-21 06:25:54 +0000 | [diff] [blame] | 2 | #include "gettext.h" |
Elijah Newren | 41771fa | 2023-02-24 00:09:27 +0000 | [diff] [blame] | 3 | #include "hex.h" |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 4 | #include "refs.h" |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 5 | #include "commit.h" |
| 6 | #include "blob.h" |
| 7 | #include "diff.h" |
| 8 | #include "revision.h" |
| 9 | #include "reachable.h" |
| 10 | #include "cache-tree.h" |
Nguyễn Thái Ngọc Duy | dc34719 | 2011-11-05 19:00:08 +0700 | [diff] [blame] | 11 | #include "progress.h" |
Jeff King | 5f78a43 | 2014-10-15 18:37:28 -0400 | [diff] [blame] | 12 | #include "list-objects.h" |
Jonathan Tan | 7709f46 | 2017-08-18 15:20:38 -0700 | [diff] [blame] | 13 | #include "packfile.h" |
Nguyễn Thái Ngọc Duy | d0c39a4 | 2017-08-23 19:36:59 +0700 | [diff] [blame] | 14 | #include "worktree.h" |
Elijah Newren | a034e91 | 2023-05-16 06:34:06 +0000 | [diff] [blame] | 15 | #include "object-store-ll.h" |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 16 | #include "pack-bitmap.h" |
Taylor Blau | fb546d6 | 2022-05-20 19:17:57 -0400 | [diff] [blame] | 17 | #include "pack-mtimes.h" |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 18 | #include "config.h" |
| 19 | #include "run-command.h" |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 20 | |
Jeff King | 0b26abc | 2011-11-08 00:37:00 -0500 | [diff] [blame] | 21 | struct connectivity_progress { |
| 22 | struct progress *progress; |
| 23 | unsigned long count; |
| 24 | }; |
| 25 | |
| 26 | static void update_progress(struct connectivity_progress *cp) |
| 27 | { |
| 28 | cp->count++; |
| 29 | if ((cp->count & 1023) == 0) |
| 30 | display_progress(cp->progress, cp->count); |
| 31 | } |
| 32 | |
Michael Haggerty | 635170f | 2015-05-25 18:39:00 +0000 | [diff] [blame] | 33 | static int add_one_ref(const char *path, const struct object_id *oid, |
| 34 | int flag, void *cb_data) |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 35 | { |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 36 | struct rev_info *revs = (struct rev_info *)cb_data; |
Johannes Schindelin | 14886b4 | 2015-09-28 16:01:25 +0200 | [diff] [blame] | 37 | struct object *object; |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 38 | |
Johannes Schindelin | 14886b4 | 2015-09-28 16:01:25 +0200 | [diff] [blame] | 39 | if ((flag & REF_ISSYMREF) && (flag & REF_ISBROKEN)) { |
| 40 | warning("symbolic ref is dangling: %s", path); |
| 41 | return 0; |
| 42 | } |
| 43 | |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 44 | object = parse_object_or_die(oid, path); |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 45 | add_pending_object(revs, object, ""); |
| 46 | |
| 47 | return 0; |
| 48 | } |
| 49 | |
Jeff King | 5f78a43 | 2014-10-15 18:37:28 -0400 | [diff] [blame] | 50 | /* |
| 51 | * The traversal will have already marked us as SEEN, so we |
| 52 | * only need to handle any progress reporting here. |
| 53 | */ |
Jeff King | c50dca2 | 2023-02-24 01:39:22 -0500 | [diff] [blame] | 54 | static void mark_object(struct object *obj UNUSED, |
| 55 | const char *name UNUSED, |
| 56 | void *data) |
Jeff King | 5f78a43 | 2014-10-15 18:37:28 -0400 | [diff] [blame] | 57 | { |
| 58 | update_progress(data); |
| 59 | } |
| 60 | |
| 61 | static void mark_commit(struct commit *c, void *data) |
| 62 | { |
Jeff King | de1e67d | 2016-02-11 17:28:36 -0500 | [diff] [blame] | 63 | mark_object(&c->object, NULL, data); |
Jeff King | 5f78a43 | 2014-10-15 18:37:28 -0400 | [diff] [blame] | 64 | } |
| 65 | |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 66 | struct recent_data { |
| 67 | struct rev_info *revs; |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 68 | timestamp_t timestamp; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 69 | report_recent_object_fn *cb; |
| 70 | int ignore_in_core_kept_packs; |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 71 | |
| 72 | struct oidset extra_recent_oids; |
| 73 | int extra_recent_oids_loaded; |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 74 | }; |
| 75 | |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 76 | static int run_one_gc_recent_objects_hook(struct oidset *set, |
| 77 | const char *args) |
| 78 | { |
| 79 | struct child_process cmd = CHILD_PROCESS_INIT; |
| 80 | struct strbuf buf = STRBUF_INIT; |
| 81 | FILE *out; |
| 82 | int ret = 0; |
| 83 | |
| 84 | cmd.use_shell = 1; |
| 85 | cmd.out = -1; |
| 86 | |
| 87 | strvec_push(&cmd.args, args); |
| 88 | |
| 89 | if (start_command(&cmd)) |
| 90 | return -1; |
| 91 | |
| 92 | out = xfdopen(cmd.out, "r"); |
| 93 | while (strbuf_getline(&buf, out) != EOF) { |
| 94 | struct object_id oid; |
| 95 | const char *rest; |
| 96 | |
| 97 | if (parse_oid_hex(buf.buf, &oid, &rest) || *rest) { |
| 98 | ret = error(_("invalid extra cruft tip: '%s'"), buf.buf); |
| 99 | break; |
| 100 | } |
| 101 | |
| 102 | oidset_insert(set, &oid); |
| 103 | } |
| 104 | |
| 105 | fclose(out); |
| 106 | ret |= finish_command(&cmd); |
| 107 | |
| 108 | strbuf_release(&buf); |
| 109 | return ret; |
| 110 | } |
| 111 | |
| 112 | static void load_gc_recent_objects(struct recent_data *data) |
| 113 | { |
| 114 | const struct string_list *programs; |
| 115 | int ret = 0; |
| 116 | size_t i; |
| 117 | |
| 118 | data->extra_recent_oids_loaded = 1; |
| 119 | |
| 120 | if (git_config_get_string_multi("gc.recentobjectshook", &programs)) |
| 121 | return; |
| 122 | |
| 123 | for (i = 0; i < programs->nr; i++) { |
| 124 | ret = run_one_gc_recent_objects_hook(&data->extra_recent_oids, |
| 125 | programs->items[i].string); |
| 126 | if (ret) |
| 127 | die(_("unable to enumerate additional recent objects")); |
| 128 | } |
| 129 | } |
| 130 | |
Taylor Blau | 01e9ca4 | 2023-06-07 18:58:12 -0400 | [diff] [blame] | 131 | static int obj_is_recent(const struct object_id *oid, timestamp_t mtime, |
| 132 | struct recent_data *data) |
| 133 | { |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 134 | if (mtime > data->timestamp) |
| 135 | return 1; |
| 136 | |
| 137 | if (!data->extra_recent_oids_loaded) |
| 138 | load_gc_recent_objects(data); |
| 139 | return oidset_contains(&data->extra_recent_oids, oid); |
Taylor Blau | 01e9ca4 | 2023-06-07 18:58:12 -0400 | [diff] [blame] | 140 | } |
| 141 | |
brian m. carlson | 76c1d9a | 2017-02-21 23:47:35 +0000 | [diff] [blame] | 142 | static void add_recent_object(const struct object_id *oid, |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 143 | struct packed_git *pack, |
| 144 | off_t offset, |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 145 | timestamp_t mtime, |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 146 | struct recent_data *data) |
| 147 | { |
| 148 | struct object *obj; |
| 149 | enum object_type type; |
| 150 | |
Taylor Blau | 01e9ca4 | 2023-06-07 18:58:12 -0400 | [diff] [blame] | 151 | if (!obj_is_recent(oid, mtime, data)) |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 152 | return; |
| 153 | |
| 154 | /* |
| 155 | * We do not want to call parse_object here, because |
| 156 | * inflating blobs and trees could be very expensive. |
| 157 | * However, we do need to know the correct type for |
| 158 | * later processing, and the revision machinery expects |
| 159 | * commits and tags to have been parsed. |
| 160 | */ |
Stefan Beller | 0df8e96 | 2018-04-25 11:20:59 -0700 | [diff] [blame] | 161 | type = oid_object_info(the_repository, oid, NULL); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 162 | if (type < 0) |
brian m. carlson | 76c1d9a | 2017-02-21 23:47:35 +0000 | [diff] [blame] | 163 | die("unable to get object info for %s", oid_to_hex(oid)); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 164 | |
| 165 | switch (type) { |
| 166 | case OBJ_TAG: |
| 167 | case OBJ_COMMIT: |
brian m. carlson | c251c83 | 2017-05-06 22:10:38 +0000 | [diff] [blame] | 168 | obj = parse_object_or_die(oid, NULL); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 169 | break; |
| 170 | case OBJ_TREE: |
Stefan Beller | f86bcc7 | 2018-06-28 18:21:56 -0700 | [diff] [blame] | 171 | obj = (struct object *)lookup_tree(the_repository, oid); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 172 | break; |
| 173 | case OBJ_BLOB: |
Stefan Beller | da14a7f | 2018-06-28 18:21:55 -0700 | [diff] [blame] | 174 | obj = (struct object *)lookup_blob(the_repository, oid); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 175 | break; |
| 176 | default: |
| 177 | die("unknown object type for %s: %s", |
Brandon Williams | debca9d | 2018-02-14 10:59:24 -0800 | [diff] [blame] | 178 | oid_to_hex(oid), type_name(type)); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 179 | } |
| 180 | |
| 181 | if (!obj) |
brian m. carlson | 76c1d9a | 2017-02-21 23:47:35 +0000 | [diff] [blame] | 182 | die("unable to lookup %s", oid_to_hex(oid)); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 183 | |
| 184 | add_pending_object(data->revs, obj, ""); |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 185 | if (data->cb) |
| 186 | data->cb(obj, pack, offset, mtime); |
| 187 | } |
| 188 | |
| 189 | static int want_recent_object(struct recent_data *data, |
| 190 | const struct object_id *oid) |
| 191 | { |
| 192 | if (data->ignore_in_core_kept_packs && |
| 193 | has_object_kept_pack(oid, IN_CORE_KEEP_PACKS)) |
| 194 | return 0; |
| 195 | return 1; |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 196 | } |
| 197 | |
brian m. carlson | 76c1d9a | 2017-02-21 23:47:35 +0000 | [diff] [blame] | 198 | static int add_recent_loose(const struct object_id *oid, |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 199 | const char *path, void *data) |
| 200 | { |
| 201 | struct stat st; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 202 | struct object *obj; |
| 203 | |
| 204 | if (!want_recent_object(data, oid)) |
| 205 | return 0; |
| 206 | |
| 207 | obj = lookup_object(the_repository, oid); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 208 | |
| 209 | if (obj && obj->flags & SEEN) |
| 210 | return 0; |
| 211 | |
| 212 | if (stat(path, &st) < 0) { |
| 213 | /* |
| 214 | * It's OK if an object went away during our iteration; this |
| 215 | * could be due to a simultaneous repack. But anything else |
| 216 | * we should abort, since we might then fail to mark objects |
| 217 | * which should not be pruned. |
| 218 | */ |
| 219 | if (errno == ENOENT) |
| 220 | return 0; |
brian m. carlson | 76c1d9a | 2017-02-21 23:47:35 +0000 | [diff] [blame] | 221 | return error_errno("unable to stat %s", oid_to_hex(oid)); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 222 | } |
| 223 | |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 224 | add_recent_object(oid, NULL, 0, st.st_mtime, data); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 225 | return 0; |
| 226 | } |
| 227 | |
brian m. carlson | 76c1d9a | 2017-02-21 23:47:35 +0000 | [diff] [blame] | 228 | static int add_recent_packed(const struct object_id *oid, |
Jeff King | be252d3 | 2023-02-24 01:39:24 -0500 | [diff] [blame] | 229 | struct packed_git *p, |
| 230 | uint32_t pos, |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 231 | void *data) |
| 232 | { |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 233 | struct object *obj; |
Taylor Blau | fb546d6 | 2022-05-20 19:17:57 -0400 | [diff] [blame] | 234 | timestamp_t mtime = p->mtime; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 235 | |
| 236 | if (!want_recent_object(data, oid)) |
| 237 | return 0; |
| 238 | |
| 239 | obj = lookup_object(the_repository, oid); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 240 | |
| 241 | if (obj && obj->flags & SEEN) |
| 242 | return 0; |
Taylor Blau | fb546d6 | 2022-05-20 19:17:57 -0400 | [diff] [blame] | 243 | if (p->is_cruft) { |
| 244 | if (load_pack_mtimes(p) < 0) |
| 245 | die(_("could not load cruft pack .mtimes")); |
| 246 | mtime = nth_packed_mtime(p, pos); |
| 247 | } |
| 248 | add_recent_object(oid, p, nth_packed_object_offset(p, pos), mtime, data); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 249 | return 0; |
| 250 | } |
| 251 | |
Jeff King | abcb865 | 2014-10-15 18:42:09 -0400 | [diff] [blame] | 252 | int add_unseen_recent_objects_to_traversal(struct rev_info *revs, |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 253 | timestamp_t timestamp, |
| 254 | report_recent_object_fn *cb, |
| 255 | int ignore_in_core_kept_packs) |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 256 | { |
| 257 | struct recent_data data; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 258 | enum for_each_object_flags flags; |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 259 | int r; |
| 260 | |
| 261 | data.revs = revs; |
| 262 | data.timestamp = timestamp; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 263 | data.cb = cb; |
| 264 | data.ignore_in_core_kept_packs = ignore_in_core_kept_packs; |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 265 | |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 266 | oidset_init(&data.extra_recent_oids, 0); |
| 267 | data.extra_recent_oids_loaded = 0; |
| 268 | |
Jeff King | 1385bb7 | 2015-03-27 07:32:41 -0400 | [diff] [blame] | 269 | r = for_each_loose_object(add_recent_loose, &data, |
| 270 | FOR_EACH_OBJECT_LOCAL_ONLY); |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 271 | if (r) |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 272 | goto done; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 273 | |
| 274 | flags = FOR_EACH_OBJECT_LOCAL_ONLY | FOR_EACH_OBJECT_PACK_ORDER; |
| 275 | if (ignore_in_core_kept_packs) |
| 276 | flags |= FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS; |
| 277 | |
Taylor Blau | 4dc16e2 | 2023-06-07 18:58:17 -0400 | [diff] [blame] | 278 | r = for_each_packed_object(add_recent_packed, &data, flags); |
| 279 | |
| 280 | done: |
| 281 | oidset_clear(&data.extra_recent_oids); |
| 282 | |
| 283 | return r; |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 284 | } |
| 285 | |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 286 | static int mark_object_seen(const struct object_id *oid, |
| 287 | enum object_type type, |
Jeff King | c50dca2 | 2023-02-24 01:39:22 -0500 | [diff] [blame] | 288 | int exclude UNUSED, |
| 289 | uint32_t name_hash UNUSED, |
| 290 | struct packed_git *found_pack UNUSED, |
| 291 | off_t found_offset UNUSED) |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 292 | { |
| 293 | struct object *obj = lookup_object_by_type(the_repository, oid, type); |
| 294 | if (!obj) |
| 295 | die("unable to create object '%s'", oid_to_hex(oid)); |
| 296 | |
| 297 | obj->flags |= SEEN; |
| 298 | return 0; |
| 299 | } |
| 300 | |
Nguyễn Thái Ngọc Duy | dc34719 | 2011-11-05 19:00:08 +0700 | [diff] [blame] | 301 | void mark_reachable_objects(struct rev_info *revs, int mark_reflog, |
Johannes Schindelin | dddbad7 | 2017-04-26 21:29:31 +0200 | [diff] [blame] | 302 | timestamp_t mark_recent, struct progress *progress) |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 303 | { |
Jeff King | 0b26abc | 2011-11-08 00:37:00 -0500 | [diff] [blame] | 304 | struct connectivity_progress cp; |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 305 | struct bitmap_index *bitmap_git; |
Jeff King | 0b26abc | 2011-11-08 00:37:00 -0500 | [diff] [blame] | 306 | |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 307 | /* |
| 308 | * Set up revision parsing, and mark us as being interested |
| 309 | * in all object types, not just commits. |
| 310 | */ |
| 311 | revs->tag_objects = 1; |
| 312 | revs->blob_objects = 1; |
| 313 | revs->tree_objects = 1; |
| 314 | |
| 315 | /* Add all refs from the index file */ |
Jeff King | 1be111d | 2014-10-16 20:44:30 -0400 | [diff] [blame] | 316 | add_index_objects_to_pending(revs, 0); |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 317 | |
| 318 | /* Add all external refs */ |
Michael Haggerty | 635170f | 2015-05-25 18:39:00 +0000 | [diff] [blame] | 319 | for_each_ref(add_one_ref, revs); |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 320 | |
Max Kirillov | c40fdd0 | 2014-09-03 19:14:10 +0300 | [diff] [blame] | 321 | /* detached HEAD is not included in the list above */ |
Michael Haggerty | 635170f | 2015-05-25 18:39:00 +0000 | [diff] [blame] | 322 | head_ref(add_one_ref, revs); |
Nguyễn Thái Ngọc Duy | d0c39a4 | 2017-08-23 19:36:59 +0700 | [diff] [blame] | 323 | other_head_refs(add_one_ref, revs); |
Max Kirillov | c40fdd0 | 2014-09-03 19:14:10 +0300 | [diff] [blame] | 324 | |
Nicolas Pitre | eb8381c | 2007-02-03 13:25:43 -0500 | [diff] [blame] | 325 | /* Add all reflog info */ |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 326 | if (mark_reflog) |
Jeff King | 718ccc9 | 2014-10-15 18:38:31 -0400 | [diff] [blame] | 327 | add_reflogs_to_pending(revs, 0); |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 328 | |
Jeff King | 0b26abc | 2011-11-08 00:37:00 -0500 | [diff] [blame] | 329 | cp.progress = progress; |
| 330 | cp.count = 0; |
| 331 | |
Derrick Stolee | 09d4a79 | 2022-03-09 16:01:35 +0000 | [diff] [blame] | 332 | bitmap_git = prepare_bitmap_walk(revs, 0); |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 333 | if (bitmap_git) { |
Jeff King | 4eb707e | 2020-02-14 13:22:27 -0500 | [diff] [blame] | 334 | traverse_bitmap_commit_list(bitmap_git, revs, mark_object_seen); |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 335 | free_bitmap_index(bitmap_git); |
Jeff King | 2ba582b | 2021-04-28 11:42:43 -0400 | [diff] [blame] | 336 | } else { |
| 337 | if (prepare_revision_walk(revs)) |
| 338 | die("revision walk setup failed"); |
| 339 | traverse_commit_list(revs, mark_commit, mark_object, &cp); |
Jeff King | fde67d6 | 2019-02-13 23:37:43 -0500 | [diff] [blame] | 340 | } |
| 341 | |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 342 | if (mark_recent) { |
| 343 | revs->ignore_missing_links = 1; |
Taylor Blau | 2fb9040 | 2022-05-20 19:17:54 -0400 | [diff] [blame] | 344 | if (add_unseen_recent_objects_to_traversal(revs, mark_recent, |
| 345 | NULL, 0)) |
Jeff King | d3038d2 | 2014-10-15 18:41:35 -0400 | [diff] [blame] | 346 | die("unable to mark recent objects"); |
| 347 | if (prepare_revision_walk(revs)) |
| 348 | die("revision walk setup failed"); |
| 349 | traverse_commit_list(revs, mark_commit, mark_object, &cp); |
| 350 | } |
| 351 | |
Jeff King | 0b26abc | 2011-11-08 00:37:00 -0500 | [diff] [blame] | 352 | display_progress(cp.progress, cp.count); |
Junio C Hamano | 9442147 | 2007-01-06 02:16:17 -0800 | [diff] [blame] | 353 | } |