diff: introduce DIFF_PICKAXE_KINDS_MASK

diff --git a/revision.c b/revision.c
index ccf1d212cee4dba953cbf9674f74df41dedbd9e6..5d11ecaf275635c20bf841bea7a3cced9f409b4f 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -2407,7 +2407,7 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct s
                revs->diff = 1;
 
        /* Pickaxe, diff-filter and rename following need diffs */
-       if (revs->diffopt.pickaxe ||
+       if ((revs->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
            revs->diffopt.filter ||
            revs->diffopt.flags.follow_renames)
                revs->diff = 1;