Skip to content

Commit acd6f0d

Browse files
jonathantanmygitster
authored andcommitted
object-file: remove OBJECT_INFO_IGNORE_LOOSE
Its last user was removed in 97b2fa0 (fetch-pack: drop custom loose object cache, 2018-11-12), so we can remove it. Helped-by: Jeff King <[email protected]> Signed-off-by: Jonathan Tan <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7452749 commit acd6f0d

File tree

2 files changed

+1
-6
lines changed

2 files changed

+1
-6
lines changed

object-file.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,9 +1575,6 @@ static int do_oid_object_info_extended(struct repository *r,
15751575
if (find_pack_entry(r, real, &e))
15761576
break;
15771577

1578-
if (flags & OBJECT_INFO_IGNORE_LOOSE)
1579-
return -1;
1580-
15811578
/* Most likely it's a loose object. */
15821579
if (!loose_object_info(r, real, oi, flags))
15831580
return 0;

object-store.h

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -434,13 +434,11 @@ struct object_info {
434434
#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
435435
/* Do not retry packed storage after checking packed and loose storage */
436436
#define OBJECT_INFO_QUICK 8
437-
/* Do not check loose object */
438-
#define OBJECT_INFO_IGNORE_LOOSE 16
439437
/*
440438
* Do not attempt to fetch the object if missing (even if fetch_is_missing is
441439
* nonzero).
442440
*/
443-
#define OBJECT_INFO_SKIP_FETCH_OBJECT 32
441+
#define OBJECT_INFO_SKIP_FETCH_OBJECT 16
444442
/*
445443
* This is meant for bulk prefetching of missing blobs in a partial
446444
* clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK

0 commit comments

Comments
 (0)