diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-01-24 00:16:37 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-24 00:16:37 +0300 |
| commit | c0d75f0e2e2cbf432358bfd00be593fd28e257a3 (patch) | |
| tree | ddf40ec50af3fb5dae3793950ec366fd3a03e2b5 /builtin/log.c | |
| parent | addd37cd64e109eb0224e522869962519224cc78 (diff) | |
| parent | 4d8c51aa19be94bddb7cac6b11bccb4d23dfd4f8 (diff) | |
Merge branch 'sb/diff-blobfind-pickaxe'
"diff" family of commands learned "--find-object=<object-id>" option
to limit the findings to changes that involve the named object.
* sb/diff-blobfind-pickaxe:
diff: use HAS_MULTI_BITS instead of counting bits manually
diff: properly error out when combining multiple pickaxe options
diffcore: add a pickaxe option to find a specific blob
diff: introduce DIFF_PICKAXE_KINDS_MASK
diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
diff.h: make pickaxe_opts an unsigned bit field
Diffstat (limited to 'builtin/log.c')
| -rw-r--r-- | builtin/log.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/log.c b/builtin/log.c index 14fdf39165..46b4ca13e5 100644 --- 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) |