From dac03b5518a053e52ed7ee20925970728d3ae4c3 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 24 Jan 2019 07:36:47 -0500 Subject: combine-diff: treat --dirstat like --stat Currently "--cc --dirstat" will show nothing for a merge. Like --shortstat and --summary in the previous two patches, it probably makes sense to treat it like we do --stat, and show a stat against the first-parent. This case is less obviously correct than for --shortstat and --summary, as those are basically variants of --stat themselves. It's possible we could develop a multi-parent combined dirstat format, in which case we might regret defining this first-parent behavior. But the same could be said for --stat, and in the 12+ years of it showing first-parent stats, nobody has complained. So showing the first-parent dirstat is at least _useful_, and if we later develop a clever multi-parent stat format, we'd probably have to deal with --stat anyway. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/t4013/diff.diff_--dirstat_--cc_master~1_master | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 t/t4013/diff.diff_--dirstat_--cc_master~1_master (limited to 't/t4013') diff --git a/t/t4013/diff.diff_--dirstat_--cc_master~1_master b/t/t4013/diff.diff_--dirstat_--cc_master~1_master new file mode 100644 index 0000000000..fba4e34175 --- /dev/null +++ b/t/t4013/diff.diff_--dirstat_--cc_master~1_master @@ -0,0 +1,3 @@ +$ git diff --dirstat --cc master~1 master + 40.0% dir/ +$ -- cgit v1.2.3