[PATCH] TO-SQUASH: replace the_repository with arbitrary r
From: Derrick Stolee <hidden>
Date: 2018-07-18 13:40:43
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Derrick Stolee <redacted> --- This should just be squashed into PATCH 2. builtin/replace.c | 5 ++--- replace-object.c | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/builtin/replace.c b/builtin/replace.c
index 5f34659071..d0b1cdb061 100644
--- a/builtin/replace.c
+++ b/builtin/replace.c@@ -57,9 +57,8 @@ static int show_reference(struct repository *r, const char *refname, if (get_oid(refname, &object)) return error("Failed to resolve '%s' as a valid ref.", refname); - obj_type = oid_object_info(the_repository, &object, - NULL); - repl_type = oid_object_info(the_repository, oid, NULL); + obj_type = oid_object_info(r, &object, NULL); + repl_type = oid_object_info(r, oid, NULL); printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type), oid_to_hex(oid), type_name(repl_type));
diff --git a/replace-object.c b/replace-object.c
index 01a5a59a35..017f02f8ef 100644
--- a/replace-object.c
+++ b/replace-object.c@@ -26,7 +26,7 @@ static int register_replace_ref(struct repository *r, 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;
--
2.18.0.118.gd4f65b8d14