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.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master | |
| 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.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master')
| -rw-r--r-- | t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master | 170 |
1 files changed, 0 insertions, 170 deletions
diff --git a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master b/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master deleted file mode 100644 index c7677c5951..0000000000 --- a/t/t4013/diff.format-patch_--inline_--stdout_--subject-prefix=TESTCASE_initial..master +++ /dev/null @@ -1,170 +0,0 @@ -$ git format-patch --inline --stdout --subject-prefix=TESTCASE initial..master -From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:01:00 +0000 -Subject: [TESTCASE 1/3] Second -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - - -This is the second commit. ---- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- - 3 files changed, 5 insertions(+), 3 deletions(-) - delete mode 100644 file2 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0001-Second.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0001-Second.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..8422d40 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+C -+D -diff --git a/file0 b/file0 -index 01e79c3..b414108 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+4 -+5 -+6 -diff --git a/file2 b/file2 -deleted file mode 100644 -index 01e79c3..0000000 ---- a/file2 -+++ /dev/null -@@ -1,3 +0,0 @@ --1 --2 --3 - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:02:00 +0000 -Subject: [TESTCASE 2/3] Third -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+) - create mode 100644 file1 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0002-Third.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0002-Third.patch" - -diff --git a/dir/sub b/dir/sub -index 8422d40..cead32e 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -2,3 +2,5 @@ A - B - C - D -+E -+F -diff --git a/file1 b/file1 -new file mode 100644 -index 0000000..b1e6722 ---- /dev/null -+++ b/file1 -@@ -0,0 +1,3 @@ -+A -+B -+C - ---------------g-i-t--v-e-r-s-i-o-n-- - - - -From c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a Mon Sep 17 00:00:00 2001 -From: A U Thor <author@example.com> -Date: Mon, 26 Jun 2006 00:03:00 +0000 -Subject: [TESTCASE 3/3] Side -MIME-Version: 1.0 -Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n" - -This is a multi-part message in MIME format. ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/plain; charset=UTF-8; format=fixed -Content-Transfer-Encoding: 8bit - ---- - dir/sub | 2 ++ - file0 | 3 +++ - file3 | 4 ++++ - 3 files changed, 9 insertions(+) - create mode 100644 file3 - - ---------------g-i-t--v-e-r-s-i-o-n -Content-Type: text/x-patch; name="0003-Side.patch" -Content-Transfer-Encoding: 8bit -Content-Disposition: inline; filename="0003-Side.patch" - -diff --git a/dir/sub b/dir/sub -index 35d242b..7289e35 100644 ---- a/dir/sub -+++ b/dir/sub -@@ -1,2 +1,4 @@ - A - B -+1 -+2 -diff --git a/file0 b/file0 -index 01e79c3..f4615da 100644 ---- a/file0 -+++ b/file0 -@@ -1,3 +1,6 @@ - 1 - 2 - 3 -+A -+B -+C -diff --git a/file3 b/file3 -new file mode 100644 -index 0000000..7289e35 ---- /dev/null -+++ b/file3 -@@ -0,0 +1,4 @@ -+A -+B -+1 -+2 - ---------------g-i-t--v-e-r-s-i-o-n-- - - -$ |
