diff options
| author | Sean <seanlkml@sympatico.ca> | 2006-05-23 05:34:23 -0400 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-23 23:45:37 -0700 |
| commit | fad70686b25c414b6224406d42a4dfb7c4136e85 (patch) | |
| tree | 89eb8cf5da04363380dfc6894295c832a5a5b71e /diff.c | |
| parent | 36f5b1f0c800a23b9755a0214c1c3250f34f2486 (diff) | |
| download | git-fad70686b25c414b6224406d42a4dfb7c4136e85.tar.gz git-fad70686b25c414b6224406d42a4dfb7c4136e85.tar.xz | |
--summary output should print immediately after stats.
Currently the summary is displayed after the patch. Fix this so
that the output order is stat-summary-patch. As a consequence of
the way this is coded, the --summary option will only actually
display summary data if combined with either the --stat or
--patch-with-stat option.
Signed-off-by: Sean Estabrooks <seanlkml@sympatico.ca>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 5 |
1 files changed, 4 insertions, 1 deletions
@@ -1988,6 +1988,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]); putchar(options->line_termination); } for (i = 0; i < q->nr; i++) { @@ -2001,7 +2004,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]); } |