X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=diff.c;h=9e9cfc8b75b7b761980b0d32cb0c516ea3505ba3;hb=refs%2Fheads%2Fnext;hp=a7bb9b95bd841a581d8d47d86b96b7140e9b8133;hpb=646881a15612c0039af1a4307e3981fd48931326;p=git.git diff --git a/diff.c b/diff.c index a7bb9b95..9e9cfc8b 100644 --- a/diff.c +++ b/diff.c @@ -1989,6 +1989,9 @@ void diff_flush(struct diff_options *options) show_stats(diffstat); free(diffstat); diffstat = NULL; + if (options->summary) + for (i = 0; i < q->nr; i++) + diff_summary(q->queue[i]); if (options->stat_sep) fputs(options->stat_sep, stdout); else @@ -2005,7 +2008,7 @@ void diff_flush(struct diff_options *options) } for (i = 0; i < q->nr; i++) { - if (options->summary) + if (diffstat && options->summary) diff_summary(q->queue[i]); diff_free_filepair(q->queue[i]); }