Merge branch 'cc/sha1-file-name'

diff --git a/combine-diff.c b/combine-diff.c
index 19f30c33539f69c773c7b104be8355d4e7e4fcdd..18c74dad51daf4cd7fb0694ad9ace62098fefac4 100644 (file)
--- 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;