diff options
| author | Stefan Beller <sbeller@google.com> | 2018-06-29 04:21:51 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-06-29 20:43:38 +0300 |
| commit | 109cd76dd3467bd05f8d2145b857006649741d5c (patch) | |
| tree | 3b3baf8fb9861083f665e91e77e5ee07ec504747 /builtin/receive-pack.c | |
| parent | b16b60f71b2354cbad5f2dc16bd5f6cf7d617579 (diff) | |
object: add repository argument to parse_object
Add a repository argument to allow the callers of parse_object
to be more specific about which repository to act on. 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: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/receive-pack.c')
| -rw-r--r-- | builtin/receive-pack.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 44c7c9ee82..400d31c18c 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -1108,8 +1108,8 @@ static const char *update(struct command *cmd, struct shallow_info *si) struct object *old_object, *new_object; struct commit *old_commit, *new_commit; - old_object = parse_object(old_oid); - new_object = parse_object(new_oid); + old_object = parse_object(the_repository, old_oid); + new_object = parse_object(the_repository, new_oid); if (!old_object || !new_object || old_object->type != OBJ_COMMIT || @@ -1132,7 +1132,7 @@ static const char *update(struct command *cmd, struct shallow_info *si) if (is_null_oid(new_oid)) { struct strbuf err = STRBUF_INIT; - if (!parse_object(old_oid)) { + if (!parse_object(the_repository, old_oid)) { old_oid = NULL; if (ref_exists(name)) { rp_warning("Allowing deletion of corrupt ref."); |