diff --git a/builtin-log.c b/builtin-log.c
index 69f2911cb4739ba211ac692ded2aa0a6d31cb989..c4ceee0f9801dcfbfb6aafe386dad3cc48b31560 100644 (file)
--- a/builtin-log.c
+++ b/builtin-log.c
rev->commit_format = CMIT_FMT_DEFAULT;
rev->verbose_header = 1;
argc = setup_revisions(argc, argv, rev, "HEAD");
+ if (rev->always_show_header) {
+ if (rev->diffopt.pickaxe || rev->diffopt.filter) {
+ rev->always_show_header = 0;
+ if (rev->diffopt.output_format == DIFF_FORMAT_RAW)
+ rev->diffopt.output_format = DIFF_FORMAT_NO_OUTPUT;
+ }
+ }
if (argc > 1)
die("unrecognized argument: %s", argv[1]);