diff options
author | Stefan Beller <sbeller@google.com> | 2018-04-25 21:20:59 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-26 04:54:27 +0300 |
commit | 0df8e96566ddcae4adc4efc096944c064f60b8bd (patch) | |
tree | 19c8b0277b21dcd9a9baa71ca5541bd59853afae /builtin/replace.c | |
parent | 7ecd8690602170f0993923c99645c7c6005e3dfa (diff) |
cache.h: add repository argument to oid_object_info
Add a repository argument to allow the callers of oid_object_info
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.
As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.
Signed-off-by: Stefan Beller <sbeller@google.com>
Reviewed-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/replace.c')
-rw-r--r-- | builtin/replace.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/builtin/replace.c b/builtin/replace.c index 237ea656cf..14e142d5a8 100644 --- a/builtin/replace.c +++ b/builtin/replace.c @@ -55,8 +55,9 @@ static int show_reference(const char *refname, const struct object_id *oid, if (get_oid(refname, &object)) return error("Failed to resolve '%s' as a valid ref.", refname); - obj_type = oid_object_info(&object, NULL); - repl_type = oid_object_info(oid, NULL); + obj_type = oid_object_info(the_repository, &object, + NULL); + repl_type = oid_object_info(the_repository, oid, NULL); printf("%s (%s) -> %s (%s)\n", refname, type_name(obj_type), oid_to_hex(oid), type_name(repl_type)); @@ -164,8 +165,8 @@ static int replace_object_oid(const char *object_ref, struct ref_transaction *transaction; struct strbuf err = STRBUF_INIT; - obj_type = oid_object_info(object, NULL); - repl_type = oid_object_info(repl, NULL); + obj_type = oid_object_info(the_repository, object, NULL); + repl_type = oid_object_info(the_repository, repl, NULL); if (!force && obj_type != repl_type) die("Objects must be of the same type.\n" "'%s' points to a replaced object of type '%s'\n" @@ -292,7 +293,7 @@ static int edit_and_replace(const char *object_ref, int force, int raw) if (get_oid(object_ref, &old_oid) < 0) die("Not a valid object name: '%s'", object_ref); - type = oid_object_info(&old_oid, NULL); + type = oid_object_info(the_repository, &old_oid, NULL); if (type < 0) die("unable to get object type for %s", oid_to_hex(&old_oid)); |