summaryrefslogtreecommitdiff
path: root/t/t4013
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2019-01-24 12:34:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-01-24 20:18:53 (GMT)
commit8290faa077784a2518d0a77b448ca2987c3baf07 (patch)
treec58a8f0b62dbb362720c6b577c599506f8f5c0a2 /t/t4013
parent8817f0cc6751199a996342fbc28bd343d231a5ca (diff)
downloadgit-8290faa077784a2518d0a77b448ca2987c3baf07.zip
git-8290faa077784a2518d0a77b448ca2987c3baf07.tar.gz
git-8290faa077784a2518d0a77b448ca2987c3baf07.tar.bz2
combine-diff: treat --shortstat like --stat
The --stat of a combined diff is defined as the first-parent stat, going all the way back to 965f803c32 (combine-diff: show diffstat with the first parent., 2006-04-17). Naturally, we gave --numstat the same treatment in 74e2abe5b7 (diff --numstat, 2006-10-12). But --shortstat, which is really just the final line of --stat, does nothing, which produces confusing results: $ git show --oneline --stat eab7584e37 eab7584e37 Merge branch 'en/show-ref-doc-fix' Documentation/git-show-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) $ git show --oneline --shortstat eab7584e37 eab7584e37 Merge branch 'en/show-ref-doc-fix' [nothing! We'd expect to see the "1 file changed..." line] This patch teaches combine-diff to treats the two formats identically. Reported-by: David Turner <novalis@novalis.org> 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_--shortstat_master4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_--shortstat_master b/t/t4013/diff.diff-tree_--cc_--shortstat_master
new file mode 100644
index 0000000..a4ca42d
--- /dev/null
+++ b/t/t4013/diff.diff-tree_--cc_--shortstat_master
@@ -0,0 +1,4 @@
+$ git diff-tree --cc --shortstat master
+59d314ad6f356dd08601a4cd5e530381da3e3c64
+ 2 files changed, 5 insertions(+)
+$