diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-01-22 23:07:30 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-01-22 23:07:30 (GMT) |
| commit | e26bd14c8d7c7983d741cd59c076d33306b7050e (patch) | |
| tree | 72eff3c850661f6ddd8d7aecf978ae05d1b36f12 /object-store.h | |
| parent | 9403e5dcdd50661a31f7d5103c150a95ab9f0529 (diff) | |
| parent | 9c8a294a1ae1335511475db9c0eb8841c0ec9738 (diff) | |
| download | git-e26bd14c8d7c7983d741cd59c076d33306b7050e.zip git-e26bd14c8d7c7983d741cd59c076d33306b7050e.tar.gz git-e26bd14c8d7c7983d741cd59c076d33306b7050e.tar.bz2 | |
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.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/object-store.h b/object-store.h index 55ee639..61b8b13 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 */ |