Re: [PATCH 05/19] object: parse_object to honor its repository argument
- From
- Jonathan Tan <jonathantanmy@google.com>
- Date
- Oct 11, 2018, 22:11 UTC
- Message-ID
- <20181011221114.186377-1-jonathantanmy@google.com>
- In-Reply-To
- <20181011211754.31369-6-sbeller@google.com>
> In 8e4b0b6047 (object.c: allow parse_object to handle > arbitrary repositories, 2018-06-28), we forgot to pass the > repository down to the read_object_file.
[snip]
Show 6 quoted lines
> @@ -270,7 +270,7 @@ struct object *parse_object(struct repository *r, const struct object_id *oid) > return lookup_object(r, oid->hash); > } > > - buffer = read_object_file(oid, &type, &size); > + buffer = repo_read_object_file(r, oid, &type, &size);
There is still the matter of the 2 invocations of has_object_file() earlier in this function. The first one probably can be replaced with oid_object_info_extended() (see the definition of has_sha1_file_with_flags() to see how to do it), and the second one looks redundant to me and can be removed. Apart from that, I don't see any other invocations that need to be converted, so parse_object() will indeed fully honor its repository argument.