changed the default branch from master to main

arturcic · arturcic · commit 8b653e9f75ca · 2021-02-01T11:00:00.000+02:00
diff --git a/README.md b/README.md
@@ -53,16 +53,16 @@ from The Noun Project.
 [semver]:                          http://semver.org
 [gitter]:                          https://gitter.im/GitTools/GitVersion?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 [gitter-badge]:                    https://badges.gitter.im/Join+Chat.svg
-[appveyor]:                        https://ci.appveyor.com/project/GitTools/gitversion/branch/master
-[appveyor-badge]:                  https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/master?svg=true
+[appveyor]:                        https://ci.appveyor.com/project/GitTools/gitversion/branch/main
+[appveyor-badge]:                  https://ci.appveyor.com/api/projects/status/sxje0wht0cscmn7w/branch/main?svg=true
 [azure-pipeline]:                  https://dev.azure.com/GitTools/GitVersion/_build/latest?definitionId=1
 [azure-pipeline-badge]:            https://dev.azure.com/GitTools/GitVersion/_apis/build/status/GitTools.GitVersion
 [github-actions]:                  https://github.com/GitTools/GitVersion/actions
 [github-actions-badge]:            https://github.com/GitTools/GitVersion/workflows/Build/badge.svg
 [travis]:                          https://travis-ci.org/GitTools/GitVersion
-[travis-badge]:                    https://travis-ci.org/GitTools/GitVersion.svg?branch=master
+[travis-badge]:                    https://travis-ci.org/GitTools/GitVersion.svg?branch=main
 [codecov]:                         https://codecov.io/gh/GitTools/GitVersion
-[codecov-badge]:                   https://codecov.io/gh/GitTools/GitVersion/branch/master/graph/badge.svg
+[codecov-badge]:                   https://codecov.io/gh/GitTools/GitVersion/branch/main/graph/badge.svg
 [docs]:                            https://gitversion.net/docs/
 [gh-rel]:                          https://github.com/GitTools/GitVersion/releases/latest
 [gh-rel-badge]:                    https://img.shields.io/github/release/gittools/gitversion.svg?logo=github
@@ -82,11 +82,11 @@ from The Noun Project.
 [az-pipeline-task-badge]:          https://img.shields.io/badge/marketplace-gittools.gittools-blue?logo=azure-pipelines
 [gh-actions]:                      https://github.com/marketplace/actions/gittools
 [gh-actions-badge]:                https://img.shields.io/badge/marketplace-gittools-blue?logo=github
-[contribute]:                      https://github.com/GitTools/GitVersion/blob/master/CONTRIBUTING.md
+[contribute]:                      https://github.com/GitTools/GitVersion/blob/main/CONTRIBUTING.md
 [why]:                             https://gitversion.net/docs/why
 [usage]:                           https://gitversion.net/docs/usage/usage
 [how]:                             https://gitversion.net/docs/more-info/how-it-works
 [faq]:                             https://gitversion.net/docs/faq
 [who]:                             https://gitversion.net/docs/who
-[gv-in-action]:                    https://raw.github.com/GitTools/GitVersion/master/docs/input/docs/img/README.png
-[banner]:                          https://github.com/GitTools/graphics/raw/master/GitVersion/banner-1280x640.png
+[gv-in-action]:                    https://raw.github.com/GitTools/GitVersion/main/docs/input/docs/img/README.png
+[banner]:                          https://github.com/GitTools/graphics/raw/main/GitVersion/banner-1280x640.png
diff --git a/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs b/src/GitTools.Testing/Fixtures/RepositoryFixtureBase.cs
@@ -66,7 +66,7 @@ public void Checkout(string branch)
 
         public static void Init(string path)
         {
-            GitTestExtensions.ExecuteGitCmd($"init {path} -b master");
+            GitTestExtensions.ExecuteGitCmd($"init {path} -b main");
         }
 
         public void MakeATaggedCommit(string tag)
diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersion.Core.Tests/Configuration/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -25,7 +25,7 @@ branches:
     is-release-branch: false
     is-mainline: false
     pre-release-weight: 0
-  master:
+  main:
     mode: ContinuousDelivery
     tag: ''
     increment: Patch
@@ -48,7 +48,7 @@ branches:
     regex: ^releases?[/-]
     source-branches:
     - develop
-    - master
+    - main
     - support
     - release
     tracks-release-branches: false
@@ -64,7 +64,7 @@ branches:
     regex: ^features?[/-]
     source-branches:
     - develop
-    - master
+    - main
     - release
     - feature
     - support
@@ -83,7 +83,7 @@ branches:
     regex: ^(pull|pull\-requests|pr)[/-]
     source-branches:
     - develop
-    - master
+    - main
     - release
     - feature
     - support
@@ -101,7 +101,7 @@ branches:
     regex: ^hotfix(es)?[/-]
     source-branches:
     - develop
-    - master
+    - main
     - support
     tracks-release-branches: false
     is-release-branch: false
@@ -115,7 +115,7 @@ branches:
     track-merge-target: false
     regex: ^support[/-]
     source-branches:
-    - master
+    - main
     tracks-release-branches: false
     is-release-branch: false
     is-mainline: true
diff --git a/src/GitVersion.Core.Tests/Helpers/TestBase.cs b/src/GitVersion.Core.Tests/Helpers/TestBase.cs
@@ -12,7 +12,7 @@ public class TestBase
         protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";
         protected const string NoMono = "NoMono";
         protected const string NoNet48 = "NoNet48";
-        public const string MainBranch = "master";
+        public const string MainBranch = "main";
 
         protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)
         {
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/OtherScenarios.cs
@@ -57,13 +57,13 @@ public void AllowHavingVariantsStartingWithMaster()
         }
 
         [Test]
-        public void AllowHavingMainInsteadOfMaster()
+        public void AllowHavingMasterInsteadOfMain()
         {
             using var fixture = new EmptyRepositoryFixture();
             fixture.Repository.MakeACommit();
             Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));
-            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("main"));
-            fixture.Repository.Branches.Remove(fixture.Repository.Branches["master"]);
+            Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("master"));
+            fixture.Repository.Branches.Remove(fixture.Repository.Branches["main"]);
 
             fixture.AssertFullSemver("0.1.0+0");
         }
diff --git a/src/GitVersion.Core/Configuration/ConfigFileLocator.cs b/src/GitVersion.Core/Configuration/ConfigFileLocator.cs
@@ -46,7 +46,7 @@ public Config ReadConfig(string workingDirectory)
             return new Config();
         }
 
-        public static void VerifyReadConfig(Config config)
+        private static void VerifyReadConfig(Config config)
         {
             // Verify no branches are set to mainline mode
             if (config.Branches.Any(b => b.Value.VersioningMode == VersioningMode.Mainline))
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilder.cs
@@ -12,7 +12,7 @@ public class ConfigurationBuilder
     {
         private const int DefaultTagPreReleaseWeight = 60000;
 
-        private readonly List<Config> _overrides = new List<Config>();
+        private readonly List<Config> _overrides = new();
 
         public ConfigurationBuilder Add([NotNull] Config config)
         {
@@ -87,22 +87,24 @@ private static void ApplyBranchOverrides(Config targetConfig, Config overrideCon
 
                 var targetConfigBranches = targetConfig.Branches;
 
-                foreach (var (key, source) in overrideConfig.Branches)
+                foreach (var (name, branchConfig) in overrideConfig.Branches)
                 {
-                    if (!targetConfigBranches.TryGetValue(key, out var target))
+                    // for compatibility reason we check if it's master, we rename it to main
+                    var branchName = name == Config.MasterBranchKey ? Config.MainBranchKey : name;
+                    if (!targetConfigBranches.TryGetValue(branchName, out var target))
                     {
-                        target = BranchConfig.CreateDefaultBranchConfig(key);
+                        target = BranchConfig.CreateDefaultBranchConfig(branchName);
                     }
 
-                    source.MergeTo(target);
-                    newBranches[key] = target;
+                    branchConfig.MergeTo(target);
+                    newBranches[branchName] = target;
                 }
 
-                foreach (var (key, branchConfig) in targetConfigBranches)
+                foreach (var (name, branchConfig) in targetConfigBranches)
                 {
-                    if (!newBranches.ContainsKey(key))
+                    if (!newBranches.ContainsKey(name))
                     {
-                        newBranches[key] = branchConfig;
+                        newBranches[name] = branchConfig;
                     }
                 }
 
diff --git a/src/GitVersion.Core/Model/Configuration/Config.cs b/src/GitVersion.Core/Model/Configuration/Config.cs
@@ -115,7 +115,7 @@ public override string ToString()
         public const string SupportBranchRegex = "^support[/-]";
         public const string DevelopBranchRegex = "^dev(elop)?(ment)?$";
         public const string MainBranchRegex = "^master$|^main$";
-        public const string MainBranchKey = "master";
+        public const string MainBranchKey = "main";
         public const string MasterBranchKey = "master";
         public const string ReleaseBranchKey = "release";
         public const string FeatureBranchKey = "feature";

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ public void Checkout(string branch)`
`66`	`66`
`67`	`67`	`public static void Init(string path)`
`68`	`68`	`{`
`69`		`- GitTestExtensions.ExecuteGitCmd($"init {path} -b master");`
	`69`	`+ GitTestExtensions.ExecuteGitCmd($"init {path} -b main");`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`public void MakeATaggedCommit(string tag)`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class TestBase`
`12`	`12`	`protected const string NoMonoDescription = "Won't run on Mono due to source information not being available for ShouldMatchApproved.";`
`13`	`13`	`protected const string NoMono = "NoMono";`
`14`	`14`	`protected const string NoNet48 = "NoNet48";`
`15`		`- public const string MainBranch = "master";`
	`15`	`+ public const string MainBranch = "main";`
`16`	`16`
`17`	`17`	`protected static IServiceProvider ConfigureServices(Action<IServiceCollection> overrideServices = null)`
`18`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -57,13 +57,13 @@ public void AllowHavingVariantsStartingWithMaster()`
`57`	`57`	`}`
`58`	`58`
`59`	`59`	`[Test]`
`60`		`- public void AllowHavingMainInsteadOfMaster()`
	`60`	`+ public void AllowHavingMasterInsteadOfMain()`
`61`	`61`	`{`
`62`	`62`	`using var fixture = new EmptyRepositoryFixture();`
`63`	`63`	`fixture.Repository.MakeACommit();`
`64`	`64`	`Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("develop"));`
`65`		`- Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("main"));`
`66`		`- fixture.Repository.Branches.Remove(fixture.Repository.Branches["master"]);`
	`65`	`+ Commands.Checkout(fixture.Repository, fixture.Repository.CreateBranch("master"));`
	`66`	`+ fixture.Repository.Branches.Remove(fixture.Repository.Branches["main"]);`
`67`	`67`
`68`	`68`	`fixture.AssertFullSemver("0.1.0+0");`
`69`	`69`	`}`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ public Config ReadConfig(string workingDirectory)`
`46`	`46`	`return new Config();`
`47`	`47`	`}`
`48`	`48`
`49`		`- public static void VerifyReadConfig(Config config)`
	`49`	`+ private static void VerifyReadConfig(Config config)`
`50`	`50`	`{`
`51`	`51`	`// Verify no branches are set to mainline mode`
`52`	`52`	`if (config.Branches.Any(b => b.Value.VersioningMode == VersioningMode.Mainline))`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public class ConfigurationBuilder`
`12`	`12`	`{`
`13`	`13`	`private const int DefaultTagPreReleaseWeight = 60000;`
`14`	`14`
`15`		`- private readonly List<Config> _overrides = new List<Config>();`
	`15`	`+ private readonly List<Config> _overrides = new();`
`16`	`16`
`17`	`17`	`public ConfigurationBuilder Add([NotNull] Config config)`
`18`	`18`	`{`
`@@ -87,22 +87,24 @@ private static void ApplyBranchOverrides(Config targetConfig, Config overrideCon`
`87`	`87`
`88`	`88`	`var targetConfigBranches = targetConfig.Branches;`
`89`	`89`
`90`		`- foreach (var (key, source) in overrideConfig.Branches)`
	`90`	`+ foreach (var (name, branchConfig) in overrideConfig.Branches)`
`91`	`91`	`{`
`92`		`- if (!targetConfigBranches.TryGetValue(key, out var target))`
	`92`	`+ // for compatibility reason we check if it's master, we rename it to main`
	`93`	`+ var branchName = name == Config.MasterBranchKey ? Config.MainBranchKey : name;`
	`94`	`+ if (!targetConfigBranches.TryGetValue(branchName, out var target))`
`93`	`95`	`{`
`94`		`- target = BranchConfig.CreateDefaultBranchConfig(key);`
	`96`	`+ target = BranchConfig.CreateDefaultBranchConfig(branchName);`
`95`	`97`	`}`
`96`	`98`
`97`		`- source.MergeTo(target);`
`98`		`- newBranches[key] = target;`
	`99`	`+ branchConfig.MergeTo(target);`
	`100`	`+ newBranches[branchName] = target;`
`99`	`101`	`}`
`100`	`102`
`101`		`- foreach (var (key, branchConfig) in targetConfigBranches)`
	`103`	`+ foreach (var (name, branchConfig) in targetConfigBranches)`
`102`	`104`	`{`
`103`		`- if (!newBranches.ContainsKey(key))`
	`105`	`+ if (!newBranches.ContainsKey(name))`
`104`	`106`	`{`
`105`		`- newBranches[key] = branchConfig;`
	`107`	`+ newBranches[name] = branchConfig;`
`106`	`108`	`}`
`107`	`109`	`}`
`108`	`110`