X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=log-tree.c;h=af36f702e16daace6781a3b044c456062692aad4;hb=78fff6ebbafe2d23464a2b059104954bfe8732c7;hp=7d9f41ede145f47fe8886770cdfb6e0bfb1abaea;hpb=cb8f64b4e3f263c113b7a2f156af74b810e969ff;p=git.git

diff --git a/log-tree.c b/log-tree.c
index 7d9f41ed..af36f702 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -43,7 +43,7 @@ static int diff_root_tree(struct rev_info *opt,
 	return retval;
 }
 
-static const char *generate_header(struct rev_info *opt,
+static const char *get_header(struct rev_info *opt,
 				   const unsigned char *commit_sha1,
 				   const unsigned char *parent_sha1,
 				   const struct commit *commit)
@@ -75,11 +75,21 @@ static const char *generate_header(struct rev_info *opt,
 	offset += pretty_print_commit(opt->commit_format, commit, len,
 				      this_header + offset,
 				      sizeof(this_header) - offset, abbrev);
+	return this_header;
+}
+
+static const char *generate_header(struct rev_info *opt,
+					const unsigned char *commit_sha1,
+					const unsigned char *parent_sha1,
+					const struct commit *commit)
+{
+	const char *header = get_header(opt, commit_sha1, parent_sha1, commit);
+
 	if (opt->always_show_header) {
-		puts(this_header);
-		return NULL;
+		puts(header);
+		header = NULL;
 	}
-	return this_header;
+	return header;
 }
 
 static int do_diff_combined(struct rev_info *opt, struct commit *commit)