summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-01-24 12:35:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-24 20:18:53 (GMT)
commit04b19fcafd734245e61fd1c090cd7de8c2993eaa (patch)
treea854de97fc20da34375096928079dbe2d376f6dd /t/t4013
parent8290faa077784a2518d0a77b448ca2987c3baf07 (diff)
downloadgit-04b19fcafd734245e61fd1c090cd7de8c2993eaa.zip
git-04b19fcafd734245e61fd1c090cd7de8c2993eaa.tar.gz
git-04b19fcafd734245e61fd1c090cd7de8c2993eaa.tar.bz2
combine-diff: treat --summary like --stat
Currently "--cc --summary" on a merge shows nothing. Since we show "--cc --stat" as a stat against the first parent, and because --summary is typically used in combination with --stat, it makes sense to treat them both the same way. Note that we have to tweak t4013's setup a bit to test this case, as the existing merges do not have any --summary results against their first parent. But since the merge at the tip of 'master' does add and remove files with respect to the second parent, we can just make a reversed doppelganger merge where the parents are swapped. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4013')
-rw-r--r--t/t4013/diff.diff-tree_--cc_--summary_REVERSE6
1 files changed, 6 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_--summary_REVERSE b/t/t4013/diff.diff-tree_--cc_--summary_REVERSE
new file mode 100644
index 0000000..e208dd5
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--cc_--summary_REVERSE
@@ -0,0 +1,6 @@
+$ git diff-tree --cc --summary REVERSE
+2562325a7ee916efb2481da93073b82cec801cbc
+ create mode 100644 file1
+ delete mode 100644 file2
+ delete mode 100644 file3
+$