Merge branch 'jt/binsearch-with-fanout' into HEAD

diff --git a/builtin/log.c b/builtin/log.c
index 14fdf39165d20602ad8b682b55660ec2466c1d20..46b4ca13e5c11ff43c15d80e618914e671ff17a0 100644 (file)
--- a/builtin/log.c
+++ b/builtin/log.c
@@ -188,8 +188,8 @@ static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
        if (rev->show_notes)
                init_display_notes(&rev->notes_opt);
 
-       if (rev->diffopt.pickaxe || rev->diffopt.filter ||
-           rev->diffopt.flags.follow_renames)
+       if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
+           rev->diffopt.filter || rev->diffopt.flags.follow_renames)
                rev->always_show_header = 0;
 
        if (source)