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>

diff --git a/object-file.c b/object-file.c
index ed1babbac23d3f3763adf4f977213c53d7c6247c..f472f2d6a0962cd24e3237be54ee2dc0c75d6d6e 100644 (file)
--- 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;
 

diff --git a/object-store.h b/object-store.h
index f0aa03bbb9a73f6b573012b34c51bec1d1c0319c..6ccacc947b7daa381eeb8513ee716eb6e1b56c8b 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -244,13 +244,13 @@ void *map_loose_object(struct repository *r, const struct object_id *oid,
 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);
 static inline void *repo_read_object_file(struct repository *r,
                                          const struct object_id *oid,
                                          enum object_type *type,
                                          unsigned long *size)
 {
-       return read_object_file_extended(r, oid, type, size, 1);
+       return read_object_file_extended(r, oid, type, size);
 }
 #ifndef NO_THE_REPOSITORY_COMPATIBILITY_MACROS
 #define read_object_file(oid, type, size) repo_read_object_file(the_repository, oid, type, size)