diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2025-09-10 16:29:01 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-10 13:34:59 -0700 |
| commit | 877176e0b01ea6aff551fa80734116a45748c6a3 (patch) | |
| tree | 05fa1f7538b937d4321f309332f70cee4ac0f457 /t/t4013/diff.diff-tree_--cc_--patch-with-stat_main | |
| parent | breaking-changes: switch default branch to main (diff) | |
| download | git-877176e0b01ea6aff551fa80734116a45748c6a3.tar.gz git-877176e0b01ea6aff551fa80734116a45748c6a3.zip | |
t4013: switch default branch name to main
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>
Diffstat (limited to 't/t4013/diff.diff-tree_--cc_--patch-with-stat_main')
| -rw-r--r-- | t/t4013/diff.diff-tree_--cc_--patch-with-stat_main | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main new file mode 100644 index 0000000000..0ec6042097 --- /dev/null +++ b/t/t4013/diff.diff-tree_--cc_--patch-with-stat_main @@ -0,0 +1,34 @@ +$ git diff-tree --cc --patch-with-stat main +59d314ad6f356dd08601a4cd5e530381da3e3c64 + dir/sub | 2 ++ + file0 | 3 +++ + 2 files changed, 5 insertions(+) + +diff --cc dir/sub +index cead32e,7289e35..992913c +--- a/dir/sub ++++ b/dir/sub +@@@ -1,6 -1,4 +1,8 @@@ + A + B + +C + +D + +E + +F ++ 1 ++ 2 +diff --cc file0 +index b414108,f4615da..10a8a9f +--- a/file0 ++++ b/file0 +@@@ -1,6 -1,6 +1,9 @@@ + 1 + 2 + 3 + +4 + +5 + +6 ++ A ++ B ++ C +$ |