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

Merge branch 'lp/maint-diff-three-dash-with-graph'

Browse Source 
"log -p --graph" used with "--stat" had a few formatting error.

By Lucian Poston
* lp/maint-diff-three-dash-with-graph:
  t4202: add test for "log --graph --stat -p" separator lines
  log --graph: fix break in graph lines
  log --graph --stat: three-dash separator should come after graph lines
This commit is contained in:
Junio C Hamano
2012-04-23 12:57:20 -07:00
parent ba8e6326f1 e2c59667ed
commit 31a199a76e
3 changed files with 299 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
diff.c
View File

@ -4414,6 +4414,12 @@ void diff_flush(struct diff_options *options)
if (output_format & DIFF_FORMAT_PATCH) {
if (separator) {
if (options->output_prefix) {
struct strbuf *msg = NULL;
msg = options->output_prefix(options,
options->output_prefix_data);
fwrite(msg->buf, msg->len, 1, stdout);
}
putc(options->line_termination, options->file);
if (options->stat_sep) {
/* attach patch instead of inline */