mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with_raw, with_stat and summary variables to output_format

Browse Source 
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>
This commit is contained in:
Timo Hirvonen
2006-06-24 20:21:53 +03:00
committed by Junio C Hamano
parent 1ef9e05dbf
commit c6744349df
6 changed files with 140 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
log-tree.c
View File

@ -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;
}