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.show_master | 36 ------------------------------------ 1 file changed, 36 deletions(-) delete mode 100644 t/t4013/diff.show_master (limited to 't/t4013/diff.show_master') diff --git a/t/t4013/diff.show_master b/t/t4013/diff.show_master deleted file mode 100644 index fb08ce0e46..0000000000 --- a/t/t4013/diff.show_master +++ /dev/null @@ -1,36 +0,0 @@ -$ git show master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 -Merge: 9a6d494 c7a2ab9 -Author: A U Thor -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -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-5-g45d5