diff options
| author | Stefan Beller <sbeller@google.com> | 2018-01-04 22:50:41 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-04 23:02:40 (GMT) |
| commit | cf63051adad03e827e0313a57db0a79ad39a04a0 (patch) | |
| tree | 5e2459e39fcfde5c7d878dcd8bd7df8406b6517b /combine-diff.c | |
| parent | c1ddc4610c553b06591aac74b610b56448cbb976 (diff) | |
| download | git-cf63051adad03e827e0313a57db0a79ad39a04a0.zip git-cf63051adad03e827e0313a57db0a79ad39a04a0.tar.gz git-cf63051adad03e827e0313a57db0a79ad39a04a0.tar.bz2 | |
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 'combine-diff.c')
| -rw-r--r-- | combine-diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/combine-diff.c b/combine-diff.c index 2505de1..bc08c4c 100644 --- a/combine-diff.c +++ b/combine-diff.c @@ -1438,7 +1438,7 @@ void diff_tree_combined(const struct object_id *oid, opt->flags.follow_renames || opt->break_opt != -1 || opt->detect_rename || - opt->pickaxe || + (opt->pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) || opt->filter; |