diff options
| author | Timo Hirvonen <tihirvon@gmail.com> | 2006-06-25 13:54:14 +0300 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-26 14:58:41 -0700 |
| commit | 39bc9a6c2051a9fc31dc9b34b40bdd3dd94a8afb (patch) | |
| tree | 32a9d02f9dd1403bc65261c5f0ab6425cb53ad5f /log-tree.c | |
| parent | 0e677e1a6b0d1c0e848ed19d18dda1c3c797c75e (diff) | |
| download | git-39bc9a6c2051a9fc31dc9b34b40bdd3dd94a8afb.tar.gz git-39bc9a6c2051a9fc31dc9b34b40bdd3dd94a8afb.tar.xz | |
Add msg_sep to diff_options
Add msg_sep variable to struct diff_options. msg_sep is printed after
commit message. Default is "\n", format-patch sets it to "---\n".
This also removes the second argument from show_log() because all
callers derived it from the first argument:
show_log(rev, rev->loginfo, ...
Signed-off-by: Timo Hirvonen <tihirvon@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'log-tree.c')
| -rw-r--r-- | log-tree.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/log-tree.c b/log-tree.c index 7d4c51f95..ab6b68222 100644 --- a/log-tree.c +++ b/log-tree.c @@ -43,9 +43,10 @@ static int append_signoff(char *buf, int buf_sz, int at, const char *signoff) return at; } -void show_log(struct rev_info *opt, struct log_info *log, const char *sep) +void show_log(struct rev_info *opt, const char *sep) { static char this_header[16384]; + 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; @@ -163,13 +164,9 @@ int log_tree_diff_flush(struct rev_info *opt) return 0; } - if (opt->loginfo && !opt->no_commit_id) { - if (opt->diffopt.output_format & DIFF_FORMAT_DIFFSTAT) { - show_log(opt, opt->loginfo, "---\n"); - } else { - show_log(opt, opt->loginfo, "\n"); - } - } + if (opt->loginfo && !opt->no_commit_id) + show_log(opt, opt->diffopt.msg_sep); + diff_flush(&opt->diffopt); return 1; } @@ -266,7 +263,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, opt->loginfo, ""); + show_log(opt, ""); shown = 1; } opt->loginfo = NULL; |