X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=builtin-log.c;h=c4ceee0f9801dcfbfb6aafe386dad3cc48b31560;hb=7c4f59d181d801c6da08aeca74e2ef78efe4cd2b;hp=69f2911cb4739ba211ac692ded2aa0a6d31cb989;hpb=66ae0c7702e68765dad17aa05c5d9255d999216c;p=git.git

diff --git a/builtin-log.c b/builtin-log.c
index 69f2911c..c4ceee0f 100644
--- a/builtin-log.c
+++ b/builtin-log.c
@@ -19,6 +19,13 @@ static int cmd_log_wc(int argc, const char **argv, char **envp,
 	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]);