diff options
author | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:28 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2015-03-06 15:02:29 -0800 |
commit | b6488fe191c3bff0dee39cfd2a7082dd52159c47 (patch) | |
tree | 53084ec8cdbc7d2d5bb0d9ae5dce23c5359ee122 /diff.c | |
parent | 79de649c0f452c0366a7306819f10760f4ed8b92 (diff) | |
parent | ab27389affc78a521fe44fc25518e1d11a4fc433 (diff) | |
download | git-b6488fe191c3bff0dee39cfd2a7082dd52159c47.tar.gz |
Merge branch 'mk/diff-shortstat-dirstat-fix'
"git diff --shortstat --dirstat=changes" showed a dirstat based on
lines that was never asked by the end user in addition to the
dirstat that the user asked for.
* mk/diff-shortstat-dirstat-fix:
diff --shortstat --dirstat: remove duplicate output
Diffstat (limited to 'diff.c')
-rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -4541,7 +4541,7 @@ void diff_flush(struct diff_options *options) show_stats(&diffstat, options); if (output_format & DIFF_FORMAT_SHORTSTAT) show_shortstats(&diffstat, options); - if (output_format & DIFF_FORMAT_DIRSTAT) + if (output_format & DIFF_FORMAT_DIRSTAT && dirstat_by_line) show_dirstat_by_line(&diffstat, options); free_diffstat_info(&diffstat); separator++; |