git/t/t4013/diff.diff-tree_--cc_--shortstat_master, branch seenMirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=seen2025-09-10T20:34:59Zt4013: switch default branch name to main2025-09-10T20:34:59ZPhillip Woodphillip.wood@dunelm.org.uk2025-09-10T15:29:01Zurn:sha1:877176e0b01ea6aff551fa80734116a45748c6a3
Remove one of the last remaining uses of
"TEST_GIT_DEFAULT_INITIAL_BRANCH= main" in the test suite. We have
been steadily be converting tests from using "master" as the default
branch name since the introduction of TEST_GIT_DEFAULT_INITIAL_BRANCH
in 704fed9ea22 (tests: start moving to a different default main branch
name, 2020-10-23) The changes here are purely mechanical replacing
"master" with "main"
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff: treat --shortstat like --stat2019-01-24T20:18:53ZJeff Kingpeff@peff.net2019-01-24T12:34:51Zurn:sha1:8290faa077784a2518d0a77b448ca2987c3baf07
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>