diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-05-19 16:02:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-05-19 16:02:47 -0700 |
| commit | a9dcacbf2a74537916f61dd8c5f2dd2c1b4eb58a (patch) | |
| tree | 1e9684531b97a24571f1f977137fe42b5bab69f7 /replace-object.c | |
| parent | 9af978fa041d69d4281315630e659550a1d8104e (diff) | |
| parent | 4b63963f5d729cb9eb997c8912b7d500ffc53297 (diff) | |
Merge branch 'jk/oidmap-cleanup'
Code cleanup.
* jk/oidmap-cleanup:
raw_object_store: drop extra pointer to replace_map
oidmap: add size function
oidmap: rename oidmap_free() to oidmap_clear()
Diffstat (limited to 'replace-object.c')
| -rw-r--r-- | replace-object.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/replace-object.c b/replace-object.c index 7b8a09b5cb..f8c5f68837 100644 --- a/replace-object.c +++ b/replace-object.c @@ -31,7 +31,7 @@ static int register_replace_ref(const char *refname, oidcpy(&repl_obj->replacement, oid); /* Register new object */ - if (oidmap_put(r->objects->replace_map, repl_obj)) + if (oidmap_put(&r->objects->replace_map, repl_obj)) die(_("duplicate replace ref: %s"), refname); return 0; @@ -48,9 +48,7 @@ void prepare_replace_object(struct repository *r) return; } - r->objects->replace_map = - xmalloc(sizeof(*r->objects->replace_map)); - oidmap_init(r->objects->replace_map, 0); + oidmap_init(&r->objects->replace_map, 0); refs_for_each_replace_ref(get_main_ref_store(r), register_replace_ref, r); @@ -80,7 +78,7 @@ const struct object_id *do_lookup_replace_object(struct repository *r, /* Try to recursively replace the object */ while (depth-- > 0) { struct replace_object *repl_obj = - oidmap_get(r->objects->replace_map, cur); + oidmap_get(&r->objects->replace_map, cur); if (!repl_obj) return cur; cur = &repl_obj->replacement; |