8290faa077
The --stat of a combined diff is defined as the first-parent stat, going all the way back to965f803c32(combine-diff: show diffstat with the first parent., 2006-04-17). Naturally, we gave --numstat the same treatment in74e2abe5b7(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 --stateab7584e37eab7584e37Merge branch 'en/show-ref-doc-fix' Documentation/git-show-ref.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) $ git show --oneline --shortstateab7584e37eab7584e37Merge 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>
5 lines
117 B
Plaintext
5 lines
117 B
Plaintext
$ git diff-tree --cc --shortstat master
|
|
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
|
2 files changed, 5 insertions(+)
|
|
$
|