Skip to content

Commit

Permalink
log --graph: fix break in graph lines
Browse files Browse the repository at this point in the history
Output from "git log --graph --stat -p" broke the ancestry graph lines
with a single empty line between the diffstat and the patch.

Signed-off-by: Lucian Poston <lucian.poston@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Lucian Poston authored and Junio C Hamano committed Mar 20, 2012
1 parent aea69a0 commit b18e97c
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions diff.c
Original file line number Diff line number Diff line change
Expand Up @@ -4266,6 +4266,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 */
Expand Down

0 comments on commit b18e97c

Please sign in to comment.