sha1-file: split OBJECT_INFO_FOR_PREFETCH
commit31f5256c82a36edea3ea2f91e5171e3472878915
authorDerrick Stolee <dstolee@microsoft.com>
Tue, 28 May 2019 15:19:07 +0000 (28 08:19 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 May 2019 20:31:50 +0000 (28 13:31 -0700)
tree2db0ea5c2feb60a2b855083e3d7822e74da21bb4
parent0f4a4fb1c4239a2aa46343add84ad6f99f6f3aae
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>
object-store.h
sha1-file.c