summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorAdam Simpkins <adam@adamsimpkins.net>2008-04-29 08:32:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-05-03 18:48:03 (GMT)
commit028656552bc758b192027c25a1143f1c6ca66d64 (patch)
treec830540314b3c3f28b36bfbef66c38233487533e /log-tree.c
parentabfa533dea28763040beba3e3d908bbbcf818b3a (diff)
downloadgit-028656552bc758b192027c25a1143f1c6ca66d64.zip
git-028656552bc758b192027c25a1143f1c6ca66d64.tar.gz
git-028656552bc758b192027c25a1143f1c6ca66d64.tar.bz2
Remove dead code: show_log() sep argument and diff_options.msg_sep
These variables were made unnecessary by commit 3969cf7db1a13a78f3b7a36d8c1084bbe0a53459. Signed-off-by: Adam Simpkins <adam@adamsimpkins.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'log-tree.c')
-rw-r--r--log-tree.c27
1 files changed, 9 insertions, 18 deletions
diff --git a/log-tree.c b/log-tree.c
index 8f5436b..4c7d7ef 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -208,14 +208,13 @@ void log_write_email_headers(struct rev_info *opt, const char *name,
*extra_headers_p = extra_headers;
}
-void show_log(struct rev_info *opt, const char *sep)
+void show_log(struct rev_info *opt)
{
struct strbuf msgbuf;
struct log_info *log = opt->loginfo;
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;
const char *subject = NULL, *extra_headers = opt->extra_headers;
int need_8bit_cte = 0;
@@ -240,17 +239,10 @@ void show_log(struct rev_info *opt, const char *sep)
}
/*
- * 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.
+ * If use_terminator is set, add a newline at the end of the entry.
+ * Otherwise, add a diffopt.line_termination character before all
+ * entries but the first. (IOW, as a separator between entries)
*/
- extra = "";
- if (*sep != '\n' && opt->use_terminator)
- extra = "\n";
if (opt->shown_one && !opt->use_terminator)
putchar(opt->diffopt.line_termination);
opt->shown_one = 1;
@@ -292,10 +284,8 @@ void show_log(struct rev_info *opt, const char *sep)
show_reflog_message(opt->reflog_info,
opt->commit_format == CMIT_FMT_ONELINE,
opt->date_mode);
- if (opt->commit_format == CMIT_FMT_ONELINE) {
- printf("%s", sep);
+ if (opt->commit_format == CMIT_FMT_ONELINE)
return;
- }
}
}
@@ -319,7 +309,8 @@ void show_log(struct rev_info *opt, const char *sep)
if (msgbuf.len) {
fwrite(msgbuf.buf, sizeof(char), msgbuf.len, stdout);
- printf("%s%s", extra, sep);
+ if (opt->use_terminator)
+ putchar('\n');
}
strbuf_release(&msgbuf);
}
@@ -342,7 +333,7 @@ int log_tree_diff_flush(struct rev_info *opt)
* an extra newline between the end of log and the
* output for readability.
*/
- show_log(opt, opt->diffopt.msg_sep);
+ show_log(opt);
if ((opt->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT) &&
opt->verbose_header &&
opt->commit_format != CMIT_FMT_ONELINE) {
@@ -430,7 +421,7 @@ int log_tree_commit(struct rev_info *opt, struct commit *commit)
shown = log_tree_diff(opt, commit, &log);
if (!shown && opt->loginfo && opt->always_show_header) {
log.parent = NULL;
- show_log(opt, "");
+ show_log(opt);
shown = 1;
}
opt->loginfo = NULL;