| Message ID | 20181011211754.31369-6-sbeller@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Bring more repository handles into our code base | expand |
> 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] > @@ -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.
On Thu, Oct 11, 2018 at 3:11 PM Jonathan Tan <jonathantanmy@google.com> wrote: > > > 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] > > > @@ -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. I will convert the has_{sha1, object}_file[_with_flags] functions before this patch in a resend and just pass along the repository. I'll defer the change of logic to another patch to be followed up later.
diff --git a/object.c b/object.c index 51c4594515..61f49d8b99 100644 --- a/object.c +++ b/object.c @@ -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); if (buffer) { if (check_object_signature(repl, buffer, size, type_name(type)) < 0) { free(buffer);
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. Signed-off-by: Stefan Beller <sbeller@google.com> --- object.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)