Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
log --graph: fix break in graph lines
author
Lucian Poston
<lucian.poston@gmail.com>
Tue, 20 Mar 2012 08:05:34 +0000
(
01:05
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Tue, 20 Mar 2012 19:30:56 +0000
(12:30 -0700)
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>
diff.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(from parent 1:
aea69a0
)
diff --git
a/diff.c
b/diff.c
index d922b77aef2da84824a8e14fc21961e36e6d2e36..7d5b7ecf14b1e8f256e78eca687474155bc006b7 100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-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 */