diff options
| author | Derrick Stolee <dstolee@microsoft.com> | 2019-05-28 15:19:07 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-05-28 20:31:50 (GMT) |
| commit | 31f5256c82a36edea3ea2f91e5171e3472878915 (patch) | |
| tree | 2db0ea5c2feb60a2b855083e3d7822e74da21bb4 /sha1-file.c | |
| parent | 0f4a4fb1c4239a2aa46343add84ad6f99f6f3aae (diff) | |
| download | git-31f5256c82a36edea3ea2f91e5171e3472878915.zip git-31f5256c82a36edea3ea2f91e5171e3472878915.tar.gz git-31f5256c82a36edea3ea2f91e5171e3472878915.tar.bz2 | |
sha1-file: split OBJECT_INFO_FOR_PREFETCH
The OBJECT_INFO_FOR_PREFETCH bitflag was added to sha1-file.c in 0f4a4fb1
(sha1-file: support OBJECT_INFO_FOR_PREFETCH, 2019-03-29) and is used to
prevent the fetch_objects() method when enabled.
However, there is a problem with the current use. The definition of
OBJECT_INFO_FOR_PREFETCH is given by adding 32 to OBJECT_INFO_QUICK. This is
clearly stated above the definition (in a comment) that this is so
OBJECT_INFO_FOR_PREFETCH implies OBJECT_INFO_QUICK. The problem is that using
"flag & OBJECT_INFO_FOR_PREFETCH" means that OBJECT_INFO_QUICK also implies
OBJECT_INFO_FOR_PREFETCH.
Split out the single bit from OBJECT_INFO_FOR_PREFETCH into a new
OBJECT_INFO_SKIP_FETCH_OBJECT as the single bit and keep
OBJECT_INFO_FOR_PREFETCH as the union of two flags. This allows a clearer use
of flag checking while also keeping the implication of OBJECT_INFO_QUICK.
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'sha1-file.c')
| -rw-r--r-- | sha1-file.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sha1-file.c b/sha1-file.c index ad02649..0299fdd 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -1371,7 +1371,7 @@ int oid_object_info_extended(struct repository *r, const struct object_id *oid, /* Check if it is a missing object */ if (fetch_if_missing && repository_format_partial_clone && !already_retried && r == the_repository && - !(flags & OBJECT_INFO_FOR_PREFETCH)) { + !(flags & OBJECT_INFO_SKIP_FETCH_OBJECT)) { /* * TODO Investigate having fetch_object() return * TODO error/success and stopping the music here. |