diff options
| author |  Stefan Beller <sbeller@google.com> | 2018-01-04 14:50:41 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2018-01-04 15:02:40 -0800 |
| commit | cf63051adad03e827e0313a57db0a79ad39a04a0 (patch) | |
| tree | 5e2459e39fcfde5c7d878dcd8bd7df8406b6517b /t/t3308-notes-merge.sh | |
| parent | diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit (diff) | |
| download | tgif-cf63051adad03e827e0313a57db0a79ad39a04a0.tar.xz | |
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>
Diffstat (limited to 't/t3308-notes-merge.sh')
0 files changed, 0 insertions, 0 deletions