object-file: remove OBJECT_INFO_IGNORE_LOOSE

Its last user was removed in 97b2fa08b6 (fetch-pack: drop
custom loose object cache, 2018-11-12), so we can remove it.

Helped-by: Jeff King <peff@peff.net>
Signed-off-by: Jonathan Tan <jonathantanmy@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/object-file.c b/object-file.c
index 26290554bb4c5f1d679194fe7d3f2b5c78a273e2..cf724bc19b0394d8b4cc1e6ba9b5f674a0c0886f 100644 (file)
--- a/object-file.c
+++ b/object-file.c
@@ -1575,9 +1575,6 @@ static int do_oid_object_info_extended(struct repository *r,
                if (find_pack_entry(r, real, &e))
                        break;
 
-               if (flags & OBJECT_INFO_IGNORE_LOOSE)
-                       return -1;
-
                /* Most likely it's a loose object. */
                if (!loose_object_info(r, real, oi, flags))
                        return 0;

diff --git a/object-store.h b/object-store.h
index 1be57abaf10d7aa527df7f22ebaf660f6430d4d8..b1ec0bde820f4d590c9b5369d7c43bfe2ea39c2c 100644 (file)
--- a/object-store.h
+++ b/object-store.h
@@ -434,13 +434,11 @@ struct object_info {
 #define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
 /* Do not retry packed storage after checking packed and loose storage */
 #define OBJECT_INFO_QUICK 8
-/* Do not check loose object */
-#define OBJECT_INFO_IGNORE_LOOSE 16
 /*
  * Do not attempt to fetch the object if missing (even if fetch_is_missing is
  * nonzero).
  */
-#define OBJECT_INFO_SKIP_FETCH_OBJECT 32
+#define OBJECT_INFO_SKIP_FETCH_OBJECT 16
 /*
  * This is meant for bulk prefetching of missing blobs in a partial
  * clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK