summaryrefslogtreecommitdiff
path: root/object-store.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-01-22 15:07:30 -0800
committerJunio C Hamano <gitster@pobox.com>2020-01-22 15:07:30 -0800
commite26bd14c8d7c7983d741cd59c076d33306b7050e (patch)
tree72eff3c850661f6ddd8d7aecf978ae05d1b36f12 /object-store.h
parent9403e5dcdd50661a31f7d5103c150a95ab9f0529 (diff)
parent9c8a294a1ae1335511475db9c0eb8841c0ec9738 (diff)
downloadgit-e26bd14c8d7c7983d741cd59c076d33306b7050e.tar.gz
Merge branch 'jt/sha1-file-remove-oi-skip-cached'
has_object_file() said "no" given an object registered to the system via pretend_object_file(), making it inconsistent with read_object_file(), causing lazy fetch to attempt fetching an empty tree from promisor remotes. * jt/sha1-file-remove-oi-skip-cached: sha1-file: remove OBJECT_INFO_SKIP_CACHED
Diffstat (limited to 'object-store.h')
-rw-r--r--object-store.h2
1 files changed, 0 insertions, 2 deletions
diff --git a/object-store.h b/object-store.h
index 55ee639350..61b8b13e3b 100644
--- a/object-store.h
+++ b/object-store.h
@@ -292,8 +292,6 @@ struct object_info {
#define OBJECT_INFO_LOOKUP_REPLACE 1
/* Allow reading from a loose object file of unknown/bogus type */
#define OBJECT_INFO_ALLOW_UNKNOWN_TYPE 2
-/* Do not check cached storage */
-#define OBJECT_INFO_SKIP_CACHED 4
/* Do not retry packed storage after checking packed and loose storage */
#define OBJECT_INFO_QUICK 8
/* Do not check loose object */