--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>
This commit is contained in:
5
diff.c
5
diff.c
@ -1988,6 +1988,9 @@ void diff_flush(struct diff_options *options)
|
|||||||
show_stats(diffstat);
|
show_stats(diffstat);
|
||||||
free(diffstat);
|
free(diffstat);
|
||||||
diffstat = NULL;
|
diffstat = NULL;
|
||||||
|
if (options->summary)
|
||||||
|
for (i = 0; i < q->nr; i++)
|
||||||
|
diff_summary(q->queue[i]);
|
||||||
putchar(options->line_termination);
|
putchar(options->line_termination);
|
||||||
}
|
}
|
||||||
for (i = 0; i < q->nr; i++) {
|
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++) {
|
for (i = 0; i < q->nr; i++) {
|
||||||
if (options->summary)
|
if (diffstat && options->summary)
|
||||||
diff_summary(q->queue[i]);
|
diff_summary(q->queue[i]);
|
||||||
diff_free_filepair(q->queue[i]);
|
diff_free_filepair(q->queue[i]);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user