X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=log-tree.c;h=9634c4677f84e7d88965b47b5af32f23668b2142;hb=a4d34e2db5565e6b75f79f9d3938aa9151e72e44;hp=9e5416427a38359078ab35902bad2e7cffac2a0b;hpb=eab144ac49c18d981261c2d0ba964d6380d9f1da;p=git.git

diff --git a/log-tree.c b/log-tree.c
index 9e541642..9634c467 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -9,6 +9,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
 	struct commit *commit = log->commit, *parent = log->parent;
 	int abbrev = opt->diffopt.abbrev;
 	int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
+	const char *extra;
 	int len;
 
 	opt->loginfo = NULL;
@@ -18,8 +19,17 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
 	}
 
 	/*
-	 * Whitespace between commit messages, unless we are oneline
+	 * The "oneline" format has several special cases:
+	 *  - The pretty-printed commit lacks a newline at the end
+	 *    of the buffer, but we do want to make sure that we
+	 *    have a newline there. If the separator isn't already
+	 *    a newline, add an extra one.
+	 *  - unlike other log messages, the one-line format does
+	 *    not have an empty line between entries.
 	 */
+	extra = "";
+	if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
+		extra = "\n";
 	if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
 		putchar('\n');
 	opt->shown_one = 1;
@@ -38,7 +48,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
 	 * And then the pretty-printed message itself
 	 */
 	len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev);
-	printf("%s%s", this_header, sep);
+	printf("%s%s%s", this_header, extra, sep);
 }
 
 int log_tree_diff_flush(struct rev_info *opt)