From 877176e0b01ea6aff551fa80734116a45748c6a3 Mon Sep 17 00:00:00 2001 From: Phillip Wood Date: Wed, 10 Sep 2025 16:29:01 +0100 Subject: 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 Signed-off-by: Junio C Hamano --- t/t4013/diff.diff-tree_--cc_main | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 t/t4013/diff.diff-tree_--cc_main (limited to 't/t4013/diff.diff-tree_--cc_main') diff --git a/t/t4013/diff.diff-tree_--cc_main b/t/t4013/diff.diff-tree_--cc_main new file mode 100644 index 0000000000..1a962856ad --- /dev/null +++ b/t/t4013/diff.diff-tree_--cc_main @@ -0,0 +1,30 @@ +$ git diff-tree --cc main +59d314ad6f356dd08601a4cd5e530381da3e3c64 +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 +$ -- cgit v1.3