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

[git.git] / diff.c

diff --git a/diff.c b/diff.c
index 0dea484ee8c8bd2f2b356c8a8eb1ef15d1be07f4..cd029b33d536a36bc5797821848d25fa98fe7d8f 100644 (file)
--- a/diff.c
+++ b/diff.c
@@ -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 */