diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:14 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-06-17 10:15:14 -0700 |
| commit | 5d5c46b28c04348f7b680e5fe007c6344a86a70a (patch) | |
| tree | ecb93914f4ecf98aadce766bf0a30c05cd8d2fa9 /object-store.h | |
| parent | The first batch after 2.22 (diff) | |
| parent | sha1-file: split OBJECT_INFO_FOR_PREFETCH (diff) | |
| download | tgif-5d5c46b28c04348f7b680e5fe007c6344a86a70a.tar.xz | |
Merge branch 'ds/object-info-for-prefetch-fix'
Code cleanup and futureproof.
* ds/object-info-for-prefetch-fix:
sha1-file: split OBJECT_INFO_FOR_PREFETCH
Diffstat (limited to 'object-store.h')
| -rw-r--r-- | object-store.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/object-store.h b/object-store.h index 272e01e452..49f56ab8d9 100644 --- a/object-store.h +++ b/object-store.h @@ -277,10 +277,14 @@ struct object_info { #define OBJECT_INFO_IGNORE_LOOSE 16 /* * Do not attempt to fetch the object if missing (even if fetch_is_missing is - * nonzero). This is meant for bulk prefetching of missing blobs in a partial - * clone. Implies OBJECT_INFO_QUICK. + * nonzero). */ -#define OBJECT_INFO_FOR_PREFETCH (32 + OBJECT_INFO_QUICK) +#define OBJECT_INFO_SKIP_FETCH_OBJECT 32 +/* + * This is meant for bulk prefetching of missing blobs in a partial + * clone. Implies OBJECT_INFO_SKIP_FETCH_OBJECT and OBJECT_INFO_QUICK + */ +#define OBJECT_INFO_FOR_PREFETCH (OBJECT_INFO_SKIP_FETCH_OBJECT | OBJECT_INFO_QUICK) int oid_object_info_extended(struct repository *r, const struct object_id *, |