odb: rename `FOR_EACH_OBJECT_*` flags
Rename the `FOR_EACH_OBJECT_*` flags to have an `ODB_` prefix. This prepares us for a new upcoming `odb_for_each_object()` function and ensures that both the function and its flags have the same prefix. Signed-off-by: Patrick Steinhardt <ps@pks.im> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Patrick Steinhardt committed
Jan 26, 2026 at 10:51 UTC
bd1855b89760cc0f9a185010a0d92d2e11a73132
11 files changed
+36
-35
builtin/cat-file.c
+1
-1
@@ -922,7 +922,7 @@ static int batch_objects(struct batch_options *opt)
922
cb.seen = &seen;
923
924
batch_each_object(opt, batch_unordered_object,
925
- FOR_EACH_OBJECT_PACK_ORDER, &cb);
925
+ ODB_FOR_EACH_OBJECT_PACK_ORDER, &cb);
926
927
oidset_clear(&seen);
928
} else {
builtin/pack-objects.c
+5
-5
@@ -3912,7 +3912,7 @@ static void read_packs_list_from_stdin(struct rev_info *revs)
3912
for_each_object_in_pack(p,
3913
add_object_entry_from_pack,
3914
revs,
3915
- FOR_EACH_OBJECT_PACK_ORDER);
3915
+ ODB_FOR_EACH_OBJECT_PACK_ORDER);
3916
}
3917
3918
strbuf_release(&buf);
@@ -4344,10 +4344,10 @@ static void add_objects_in_unpacked_packs(void)
4344
if (for_each_packed_object(to_pack.repo,
4345
add_object_in_unpacked_pack,
4346
NULL,
4347
- FOR_EACH_OBJECT_PACK_ORDER |
4348
- FOR_EACH_OBJECT_LOCAL_ONLY |
4349
- FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
4350
- FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS))
4347
+ ODB_FOR_EACH_OBJECT_PACK_ORDER |
4348
+ ODB_FOR_EACH_OBJECT_LOCAL_ONLY |
4349
+ ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS |
4350
+ ODB_FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS))
4351
die(_("cannot open pack index"));
4352
}
4353
commit-graph.c
+2
-2
@@ -1927,7 +1927,7 @@ static int fill_oids_from_packs(struct write_commit_graph_context *ctx,
1927
goto cleanup;
1928
}
1929
for_each_object_in_pack(p, add_packed_commits, ctx,
1930
- FOR_EACH_OBJECT_PACK_ORDER);
1930
+ ODB_FOR_EACH_OBJECT_PACK_ORDER);
1931
close_pack(p);
1932
free(p);
1933
}
@@ -1965,7 +1965,7 @@ static void fill_oids_from_all_packs(struct write_commit_graph_context *ctx)
1965
_("Finding commits for commit graph among packed objects"),
1966
ctx->approx_nr_objects);
1967
for_each_packed_object(ctx->r, add_packed_commits, ctx,
1968
- FOR_EACH_OBJECT_PACK_ORDER);
1968
+ ODB_FOR_EACH_OBJECT_PACK_ORDER);
1969
if (ctx->progress_done < ctx->approx_nr_objects)
1970
display_progress(ctx->progress, ctx->approx_nr_objects);
1971
stop_progress(&ctx->progress);
object-file.c
+2
-2
@@ -1789,7 +1789,7 @@ int for_each_loose_file_in_source(struct odb_source *source,
1789
1790
int for_each_loose_object(struct object_database *odb,
1791
each_loose_object_fn cb, void *data,
1792
- enum for_each_object_flags flags)
1792
+ enum odb_for_each_object_flags flags)
1793
{
1794
struct odb_source *source;
1795
@@ -1800,7 +1800,7 @@ int for_each_loose_object(struct object_database *odb,
1800
if (r)
1801
return r;
1802
1803
- if (flags & FOR_EACH_OBJECT_LOCAL_ONLY)
1803
+ if (flags & ODB_FOR_EACH_OBJECT_LOCAL_ONLY)
1804
break;
1805
}
1806
object-file.h
+1
-1
@@ -134,7 +134,7 @@ int for_each_loose_file_in_source(struct odb_source *source,
134
*/
135
int for_each_loose_object(struct object_database *odb,
136
each_loose_object_fn, void *,
137
- enum for_each_object_flags flags);
137
+ enum odb_for_each_object_flags flags);
138
139
140
/**
odb.h
+7
-6
@@ -442,24 +442,25 @@ static inline void obj_read_unlock(void)
442
if(obj_read_use_lock)
443
pthread_mutex_unlock(&obj_read_mutex);
444
}
445
+
446
/* Flags for for_each_*_object(). */
446
-enum for_each_object_flags {
447
+enum odb_for_each_object_flags {
448
/* Iterate only over local objects, not alternates. */
448
- FOR_EACH_OBJECT_LOCAL_ONLY = (1<<0),
449
+ ODB_FOR_EACH_OBJECT_LOCAL_ONLY = (1<<0),
450
451
/* Only iterate over packs obtained from the promisor remote. */
451
- FOR_EACH_OBJECT_PROMISOR_ONLY = (1<<1),
452
+ ODB_FOR_EACH_OBJECT_PROMISOR_ONLY = (1<<1),
453
454
/*
455
* Visit objects within a pack in packfile order rather than .idx order
456
*/
456
- FOR_EACH_OBJECT_PACK_ORDER = (1<<2),
457
+ ODB_FOR_EACH_OBJECT_PACK_ORDER = (1<<2),
458
459
/* Only iterate over packs that are not marked as kept in-core. */
459
- FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),
460
+ ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS = (1<<3),
461
462
/* Only iterate over packs that do not have .keep files. */
462
- FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
463
+ ODB_FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS = (1<<4),
464
};
465
466
enum {
packfile.c
+10
-10
@@ -2259,12 +2259,12 @@ int has_object_kept_pack(struct repository *r, const struct object_id *oid,
2259
2260
int for_each_object_in_pack(struct packed_git *p,
2261
each_packed_object_fn cb, void *data,
2262
- enum for_each_object_flags flags)
2262
+ enum odb_for_each_object_flags flags)
2263
{
2264
uint32_t i;
2265
int r = 0;
2266
2267
- if (flags & FOR_EACH_OBJECT_PACK_ORDER) {
2267
+ if (flags & ODB_FOR_EACH_OBJECT_PACK_ORDER) {
2268
if (load_pack_revindex(p->repo, p))
2269
return -1;
2270
}
@@ -2285,7 +2285,7 @@ int for_each_object_in_pack(struct packed_git *p,
2285
* - in pack-order, it is pack position, which we must
2286
* convert to an index position in order to get the oid.
2287
*/
2288
- if (flags & FOR_EACH_OBJECT_PACK_ORDER)
2288
+ if (flags & ODB_FOR_EACH_OBJECT_PACK_ORDER)
2289
index_pos = pack_pos_to_index(p, i);
2290
else
2291
index_pos = i;
@@ -2302,7 +2302,7 @@ int for_each_object_in_pack(struct packed_git *p,
2302
}
2303
2304
int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
2305
- void *data, enum for_each_object_flags flags)
2305
+ void *data, enum odb_for_each_object_flags flags)
2306
{
2307
struct odb_source *source;
2308
int r = 0;
@@ -2318,15 +2318,15 @@ int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
2318
for (e = packfile_store_get_packs(source->packfiles); e; e = e->next) {
2319
struct packed_git *p = e->pack;
2320
2321
- if ((flags & FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
2321
+ if ((flags & ODB_FOR_EACH_OBJECT_LOCAL_ONLY) && !p->pack_local)
2322
continue;
2323
- if ((flags & FOR_EACH_OBJECT_PROMISOR_ONLY) &&
2323
+ if ((flags & ODB_FOR_EACH_OBJECT_PROMISOR_ONLY) &&
2324
!p->pack_promisor)
2325
continue;
2326
- if ((flags & FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS) &&
2326
+ if ((flags & ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS) &&
2327
p->pack_keep_in_core)
2328
continue;
2329
- if ((flags & FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS) &&
2329
+ if ((flags & ODB_FOR_EACH_OBJECT_SKIP_ON_DISK_KEPT_PACKS) &&
2330
p->pack_keep)
2331
continue;
2332
if (open_pack_index(p)) {
@@ -2413,8 +2413,8 @@ int is_promisor_object(struct repository *r, const struct object_id *oid)
2413
if (repo_has_promisor_remote(r)) {
2414
for_each_packed_object(r, add_promisor_object,
2415
&promisor_objects,
2416
- FOR_EACH_OBJECT_PROMISOR_ONLY |
2417
- FOR_EACH_OBJECT_PACK_ORDER);
2416
+ ODB_FOR_EACH_OBJECT_PROMISOR_ONLY |
2417
+ ODB_FOR_EACH_OBJECT_PACK_ORDER);
2418
}
2419
promisor_objects_prepared = 1;
2420
}
packfile.h
+2
-2
@@ -339,9 +339,9 @@ typedef int each_packed_object_fn(const struct object_id *oid,
339
void *data);
340
int for_each_object_in_pack(struct packed_git *p,
341
each_packed_object_fn, void *data,
342
- enum for_each_object_flags flags);
342
+ enum odb_for_each_object_flags flags);
343
int for_each_packed_object(struct repository *repo, each_packed_object_fn cb,
344
- void *data, enum for_each_object_flags flags);
344
+ void *data, enum odb_for_each_object_flags flags);
345
346
/* A hook to report invalid files in pack directory */
347
#define PACKDIR_FILE_PACK 1
reachable.c
+4
-4
@@ -307,7 +307,7 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
307
int ignore_in_core_kept_packs)
308
{
309
struct recent_data data;
310
- enum for_each_object_flags flags;
310
+ enum odb_for_each_object_flags flags;
311
int r;
312
313
data.revs = revs;
@@ -319,13 +319,13 @@ int add_unseen_recent_objects_to_traversal(struct rev_info *revs,
319
data.extra_recent_oids_loaded = 0;
320
321
r = for_each_loose_object(the_repository->objects, add_recent_loose, &data,
322
- FOR_EACH_OBJECT_LOCAL_ONLY);
322
+ ODB_FOR_EACH_OBJECT_LOCAL_ONLY);
323
if (r)
324
goto done;
325
326
- flags = FOR_EACH_OBJECT_LOCAL_ONLY | FOR_EACH_OBJECT_PACK_ORDER;
326
+ flags = ODB_FOR_EACH_OBJECT_LOCAL_ONLY | ODB_FOR_EACH_OBJECT_PACK_ORDER;
327
if (ignore_in_core_kept_packs)
328
- flags |= FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS;
328
+ flags |= ODB_FOR_EACH_OBJECT_SKIP_IN_CORE_KEPT_PACKS;
329
330
r = for_each_packed_object(revs->repo, add_recent_packed, &data, flags);
331
repack-promisor.c
+1
-1
@@ -56,7 +56,7 @@ void repack_promisor_objects(struct repository *repo,
56
ctx.cmd = &cmd;
57
ctx.algop = repo->hash_algo;
58
for_each_packed_object(repo, write_oid, &ctx,
59
- FOR_EACH_OBJECT_PROMISOR_ONLY);
59
+ ODB_FOR_EACH_OBJECT_PROMISOR_ONLY);
60
61
if (cmd.in == -1) {
62
/* No packed objects; cmd was never started */
revision.c
+1
-1
@@ -3938,7 +3938,7 @@ int prepare_revision_walk(struct rev_info *revs)
3938
3939
if (revs->exclude_promisor_objects) {
3940
for_each_packed_object(revs->repo, mark_uninteresting, revs,
3941
- FOR_EACH_OBJECT_PROMISOR_ONLY);
3941
+ ODB_FOR_EACH_OBJECT_PROMISOR_ONLY);
3942
}
3943
3944
if (!revs->reflog_info)