diff options
| author | Jeff King <peff@peff.net> | 2023-01-07 14:50:19 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-01-08 02:52:55 +0100 |
| commit | 7be13f5f743978180ba377e12a312b773ed9af2b (patch) | |
| tree | 824f3610aad9e93b5c2c034661eb52956b679449 /object-file.c | |
| parent | streaming: inline call to read_object_file_extended() (diff) | |
| download | git-7be13f5f743978180ba377e12a312b773ed9af2b.tar.xz git-7be13f5f743978180ba377e12a312b773ed9af2b.zip | |
read_object_file_extended(): drop lookup_replace option
Our sole caller always passes in "1", so we can just drop the parameter
entirely. Anybody who doesn't want this behavior could easily call
oid_object_info_extended() themselves, as we're just a thin wrapper
around it.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object-file.c')
| -rw-r--r-- | object-file.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/object-file.c b/object-file.c index ed1babbac2..f472f2d6a0 100644 --- a/object-file.c +++ b/object-file.c @@ -1698,18 +1698,15 @@ int pretend_object_file(void *buf, unsigned long len, enum object_type type, void *read_object_file_extended(struct repository *r, const struct object_id *oid, enum object_type *type, - unsigned long *size, - int lookup_replace) + unsigned long *size) { struct object_info oi = OBJECT_INFO_INIT; - unsigned flags = OBJECT_INFO_DIE_IF_CORRUPT; + unsigned flags = OBJECT_INFO_DIE_IF_CORRUPT | OBJECT_INFO_LOOKUP_REPLACE; void *data; oi.typep = type; oi.sizep = size; oi.contentp = &data; - if (lookup_replace) - flags |= OBJECT_INFO_LOOKUP_REPLACE; if (oid_object_info_extended(r, oid, &oi, flags)) return NULL; |