projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into next
[git.git]
/
diff.c
diff --git
a/diff.c
b/diff.c
index
a7bb9b9
..
9e9cfc8
100644
(file)
--- a/
diff.c
+++ b/
diff.c
@@
-1989,6
+1989,9
@@
void diff_flush(struct diff_options *options)
show_stats(diffstat);
free(diffstat);
diffstat = NULL;
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
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++) {
}
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]);
}
diff_summary(q->queue[i]);
diff_free_filepair(q->queue[i]);
}