git/diff.diff-tree_--cc_--summary_REVERSE at 40e747e89d247b3a12e6cddf848d145bf403a72c - git - Gitea: Git with a cup of tea

mirrors/git

Files

Jeff King 04b19fcafd 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>

2019-01-24 12:18:53 -08:00

7 lines

160 B

Plaintext

Raw Blame History

 $ git diff-tree --cc --summary REVERSE
 2562325a7ee916efb2481da93073b82cec801cbc
  create mode 100644 file1
  delete mode 100644 file2
  delete mode 100644 file3
 $