@matheusbsbs / matheus-bagliano / commits / a4d34e2db5
Fork 0

Log message printout cleanups (#3): fix --pretty=oneline

This option is very special, since pretty_print_commit() will _remove_ the newline at the end of it, so we want to have an extra separator between the things. I added a honking big comment this time, so that (a) I don't forget this _again_ (I broke "oneline" several times during this printout cleanup), and so that people can understand _why_ the code does what it does. Now, arguably the alternate fix is to always have the '\n' at the end in pretty-print-commit, but git-rev-list depends on the current behaviour (but we could have git-rev-list remove it, whatever). With the big comment, the code hopefully doesn't get broken again. And now things like git log --pretty=oneline --cc --patch-with-stat works (even if that is admittedly a totally insane combination: if you want the patch, having the "oneline" log format is just crazy, but hey, it _works_. Even insane people are people). Signed-off-by: Junio C Hamano <junkio@cox.net>

Linus Torvalds committed Apr 17, 2006 at 17:43 UTC a4d34e2db5565e6b75f79f9d3938aa9151e72e44
1 file changed +12 -2
log-tree.c
+12 -2
@@ -9,6 +9,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
9 struct commit *commit = log->commit, *parent = log->parent;
10 int abbrev = opt->diffopt.abbrev;
11 int abbrev_commit = opt->abbrev_commit ? opt->abbrev : 40;
12 + const char *extra;
13 int len;
14
15 opt->loginfo = NULL;
@@ -18,8 +19,17 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
19 }
20
21 /*
21 - * Whitespace between commit messages, unless we are oneline
22 + * The "oneline" format has several special cases:
23 + * - The pretty-printed commit lacks a newline at the end
24 + * of the buffer, but we do want to make sure that we
25 + * have a newline there. If the separator isn't already
26 + * a newline, add an extra one.
27 + * - unlike other log messages, the one-line format does
28 + * not have an empty line between entries.
29 */
30 + extra = "";
31 + if (*sep != '\n' && opt->commit_format == CMIT_FMT_ONELINE)
32 + extra = "\n";
33 if (opt->shown_one && opt->commit_format != CMIT_FMT_ONELINE)
34 putchar('\n');
35 opt->shown_one = 1;
@@ -38,7 +48,7 @@ void show_log(struct rev_info *opt, struct log_info *log, const char *sep)
48 * And then the pretty-printed message itself
49 */
50 len = pretty_print_commit(opt->commit_format, commit, ~0u, this_header, sizeof(this_header), abbrev);
41 - printf("%s%s", this_header, sep);
51 + printf("%s%s%s", this_header, extra, sep);
52 }
53
54 int log_tree_diff_flush(struct rev_info *opt)