summaryrefslogtreecommitdiff
path: root/log-tree.c
diff options
context:
space:
mode:
authorTimo Hirvonen <tihirvon@gmail.com>2006-06-24 20:21:53 +0300
committerJunio C Hamano <junkio@cox.net>2006-06-26 14:58:40 -0700
commitc6744349df5089133b7662e67aba28282b6a963f (patch)
tree28d3ce776203fef4c445fa03b68fb2257eeb1799 /log-tree.c
parent1ef9e05dbf36a80bb65fb150dd7bdd60852db777 (diff)
downloadgit-c6744349df5089133b7662e67aba28282b6a963f.tar.gz
Merge with_raw, with_stat and summary variables to output_format
DIFF_FORMAT_* are now bit-flags instead of enumerated values. 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.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/log-tree.c b/log-tree.c
index ebb49f2970..7d4c51f954 100644
--- a/log-tree.c
+++ b/log-tree.c
@@ -163,8 +163,13 @@ int log_tree_diff_flush(struct rev_info *opt)
return 0;
}
- if (opt->loginfo && !opt->no_commit_id)
- show_log(opt, opt->loginfo, opt->diffopt.with_stat ? "---\n" : "\n");
+ 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");
+ }
+ }
diff_flush(&opt->diffopt);
return 1;
}