[PATCH 1/2] replace-objects: use arbitrary repositories
- From
Stefan Beller <sbeller@google.com>
- Date
- Jul 30, 2018, 19:47 UTC
- Message-ID
- <20180730194731.220191-2-sbeller@google.com>
- In-Reply-To
- <20180730194731.220191-1-sbeller@google.com>
From: Derrick Stolee <dstolee@microsoft.com>
This is the smallest possible change that makes prepare_replace_objects work properly with arbitrary repositories. By supplying the repository as the cb_data, we do not need to modify any code in the ref iterator logic. We will likely want to do a full replacement of the ref iterator logic to provide a repository struct as a concrete parameter.
[sb: original commit message left as-is. I disagree with it. We want to keep the ref store API clean and focussed on struct ref_store. There is no need to treat a repository any special for pass-through by the callback cookie. So instead let's just pass the repository as a cb cookie and cleanup the API in follow up patches]
Signed-off-by: Derrick Stolee <dstolee@microsoft.com> Signed-off-by: Stefan Beller <sbeller@google.com> --- replace-object.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/replace-object.c b/replace-object.c index 801b5c16789..e99fcd1ff6e 100644 --- a/replace-object.c +++ b/replace-object.c @@ -14,6 +14,7 @@ static int register_replace_ref(const char *refname, const char *slash = strrchr(refname, '/'); const char *hash = slash ? slash + 1 : refname; struct replace_object *repl_obj = xmalloc(sizeof(*repl_obj)); + struct repository *r = (struct repository *)cb_data; if (get_oid_hex(hash, &repl_obj->original.oid)) { free(repl_obj); @@ -25,7 +26,7 @@ static int register_replace_ref(const char *refname, oidcpy(&repl_obj->replacement, oid); /* Register new object */ - if (oidmap_put(the_repository->objects->replace_map, repl_obj)) + if (oidmap_put(r->objects->replace_map, repl_obj)) die("duplicate replace ref: %s", refname); return 0; @@ -40,7 +41,7 @@ static void prepare_replace_object(struct repository *r) xmalloc(sizeof(*r->objects->replace_map)); oidmap_init(r->objects->replace_map, 0); - for_each_replace_ref(r, register_replace_ref, NULL); + for_each_replace_ref(r, register_replace_ref, r); } /* We allow "recursive" replacement. Only within reason, though */
-- 2.18.0.132.g195c49a2227