diff: introduce DIFF_PICKAXE_KINDS_MASK
authorStefan Beller <sbeller@google.com>
Thu, 4 Jan 2018 22:50:41 +0000 (14:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Thu, 4 Jan 2018 23:02:40 +0000 (15:02 -0800)
commitcf63051adad03e827e0313a57db0a79ad39a04a0
tree5e2459e39fcfde5c7d878dcd8bd7df8406b6517b
parentc1ddc4610c553b06591aac74b610b56448cbb976
diff: introduce DIFF_PICKAXE_KINDS_MASK

Currently the check whether to perform pickaxing is done via checking
`diffopt->pickaxe`, which contains the command line argument that we
want to pickaxe for. Soon we'll introduce a new type of pickaxing, that
will not store anything in the `.pickaxe` field, so let's migrate the
check to be dependent on pickaxe_opts.

It is not enough to just replace the check for pickaxe by pickaxe_opts,
because flags might be set, but pickaxing was not requested ('-i').
To cope with that, introduce a mask to check only for the bits indicating
the modes of operation.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/log.c
combine-diff.c
diff.c
diff.h
revision.c