This started as a follow-up to my "something like this" bug-fix from last July: https://public-inbox.org/git/20180710203438.GB6886@xxxxxxxxxxxxxxxxxxxxx/ (better late than never). But in the course of that, I discovered another really weird and interesting bug with --color-moved. This fixes both, along with some related cases. -Peff [1/6]: t4006: resurrect commented-out tests [2/6]: diff: clear emitted_symbols flag after use [3/6]: combine-diff: factor out stat-format mask [4/6]: combine-diff: treat --shortstat like --stat [5/6]: combine-diff: treat --summary like --stat [6/6]: combine-diff: treat --dirstat like --stat combine-diff.c | 17 ++-- diff.c | 4 +- t/t4006-diff-mode.sh | 55 +++++++------ t/t4013-diff-various.sh | 9 +++ .../diff.diff-tree_--cc_--shortstat_master | 4 + t/t4013/diff.diff-tree_--cc_--summary_REVERSE | 6 ++ .../diff.diff_--dirstat_--cc_master~1_master | 3 + t/t4066-diff-emit-delay.sh | 79 +++++++++++++++++++ 8 files changed, 147 insertions(+), 30 deletions(-) create mode 100644 t/t4013/diff.diff-tree_--cc_--shortstat_master create mode 100644 t/t4013/diff.diff-tree_--cc_--summary_REVERSE create mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master create mode 100755 t/t4066-diff-emit-delay.sh
