Revert "Insert option to considered the remote name when generating a semantic version on a remote branch."

HHobeck · HHobeck · commit 198a6577b222 · 2023-02-27T09:58:37.000+01:00
This reverts commit 3beab1e.
diff --git a/docs/input/docs/reference/configuration.md b/docs/input/docs/reference/configuration.md
@@ -40,7 +40,6 @@ created. Modify this to suit your needs.
 The global configuration looks like this:
 
 ```yaml
-remote-name-in-git: origin
 assembly-versioning-scheme: MajorMinorPatch
 assembly-file-versioning-scheme: MajorMinorPatch
 label-prefix: '[vV]?'
@@ -161,7 +160,7 @@ ignore:
   sha: []
 mode: ContinuousDelivery
 label: '{BranchName}'
-increment: Patch
+increment: Inherit
 prevent-increment-of-merged-branch-version: false
 track-merge-target: false
 track-merge-message: true
@@ -174,12 +173,6 @@ is-mainline: false
 
 The details of the available options are as follows:
 
-### remote-name-in-git
-
-The user can define the name of the remote (in moste cases it's `origin`) which
-will be considered when generating a semantic version on a remote branch. If the
-actual remote name doesn't match this pattern an error will be thrown.
-
 ### next-version
 
 Allows you to bump the next version explicitly. Useful for bumping `main` or a
diff --git a/src/GitVersion.Core.Tests/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt b/src/GitVersion.Core.Tests/Configuration/ConfigurationProviderTests.CanWriteOutEffectiveConfiguration.approved.txt
@@ -1,4 +1,3 @@
-remote-name-in-git: origin
 assembly-versioning-scheme: MajorMinorPatch
 assembly-file-versioning-scheme: MajorMinorPatch
 label-prefix: '[vV]?'
diff --git a/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs b/src/GitVersion.Core.Tests/Helpers/TestEffectiveConfiguration.cs
@@ -7,7 +7,6 @@ namespace GitVersion.Core.Tests.Helpers;
 public class TestEffectiveConfiguration : EffectiveConfiguration
 {
     public TestEffectiveConfiguration(
-        string remoteNameInGit = GitVersionConfiguration.DefaultRemoteNameInGit,
         AssemblyVersioningScheme assemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
         AssemblyFileVersioningScheme assemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
         string? assemblyVersioningFormat = null,
@@ -32,8 +31,7 @@ public TestEffectiveConfiguration(
         bool isMainline = false,
         string commitDateFormat = "yyyy-MM-dd",
         bool updateBuildNumber = false) :
-        base(remoteNameInGit,
-            assemblyVersioningScheme,
+        base(assemblyVersioningScheme,
             assemblyFileVersioningScheme,
             assemblyInformationalFormat,
             assemblyVersioningFormat,
diff --git a/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs b/src/GitVersion.Core.Tests/IntegrationTests/VersionInCurrentBranchNameScenarios.cs
@@ -38,26 +38,17 @@ public void TakesVersionFromNameOfBranchThatIsReleaseByConfig()
         fixture.AssertFullSemver("2.0.0+1", configuration);
     }
 
-    [TestCase("origin")]
-    [TestCase("upstream")]
-    public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin(string remoteNameInGit)
+    [Test]
+    public void TakesVersionFromNameOfRemoteReleaseBranchInOrigin()
     {
-        var configuration = GitFlowConfigurationBuilder.New
-            .WithRemoteNameInGit(remoteNameInGit)
-            .Build();
-
         using var fixture = new RemoteRepositoryFixture();
-        if (remoteNameInGit != "origin")
-        {
-            fixture.LocalRepositoryFixture.Repository.Network.Remotes.Rename("origin", remoteNameInGit);
-        }
         fixture.BranchTo("release/2.0.0");
         fixture.MakeACommit();
         Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
 
-        fixture.LocalRepositoryFixture.Checkout($"{remoteNameInGit}/release/2.0.0");
+        fixture.LocalRepositoryFixture.Checkout("origin/release/2.0.0");
 
-        fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0-beta.1+1", configuration);
+        fixture.LocalRepositoryFixture.AssertFullSemver("2.0.0-beta.1+1");
     }
 
     [Test]
@@ -70,8 +61,7 @@ public void DoesNotTakeVersionFromNameOfRemoteReleaseBranchInCustomRemote()
         Commands.Fetch((Repository)fixture.LocalRepositoryFixture.Repository, fixture.LocalRepositoryFixture.Repository.Network.Remotes.First().Name, Array.Empty<string>(), new FetchOptions(), null);
 
         fixture.LocalRepositoryFixture.Checkout("upstream/release/2.0.0");
-        Action action = () => fixture.LocalRepositoryFixture.GetVersion();
 
-        action.ShouldThrow<InvalidOperationException>();
+        fixture.LocalRepositoryFixture.AssertFullSemver("0.0.0-beta.1+6"); // This test fails with 2.0.0-beta.1+1
     }
 }
diff --git a/src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs b/src/GitVersion.Core/Configuration/ConfigurationBuilderBase.cs
@@ -6,7 +6,6 @@ namespace GitVersion.Configuration;
 internal abstract class ConfigurationBuilderBase<TConfigurationBuilder>
     where TConfigurationBuilder : ConfigurationBuilderBase<TConfigurationBuilder>
 {
-    private string? remoteNameInGit;
     private AssemblyVersioningScheme? assemblyVersioningScheme;
     private AssemblyFileVersioningScheme? assemblyFileVersioningScheme;
     private string? assemblyInformationalFormat;
@@ -98,13 +97,6 @@ protected ConfigurationBuilderBase()
         }
     }
 
-    public virtual TConfigurationBuilder WithRemoteNameInGit(string? value)
-    {
-        this.remoteNameInGit = value;
-        return (TConfigurationBuilder)this;
-    }
-
-
     public virtual TConfigurationBuilder WithAssemblyVersioningScheme(AssemblyVersioningScheme? value)
     {
         this.assemblyVersioningScheme = value;
@@ -332,7 +324,6 @@ public virtual TConfigurationBuilder WithPreReleaseWeight(int? value)
 
     public virtual TConfigurationBuilder WithConfiguration(GitVersionConfiguration value)
     {
-        WithRemoteNameInGit(value.RemoteNameInGit);
         WithAssemblyVersioningScheme(value.AssemblyVersioningScheme);
         WithAssemblyFileVersioningScheme(value.AssemblyFileVersioningScheme);
         WithAssemblyInformationalFormat(value.AssemblyInformationalFormat);
@@ -385,7 +376,6 @@ public virtual GitVersionConfiguration Build()
     {
         GitVersionConfiguration configuration = new()
         {
-            RemoteNameInGit = this.remoteNameInGit,
             AssemblyVersioningScheme = this.assemblyVersioningScheme,
             AssemblyFileVersioningScheme = this.assemblyFileVersioningScheme,
             AssemblyInformationalFormat = this.assemblyInformationalFormat,
diff --git a/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs b/src/GitVersion.Core/Configuration/EffectiveConfiguration.cs
@@ -37,7 +37,6 @@ public EffectiveConfiguration(GitVersionConfiguration configuration, BranchConfi
         if (!configuration.LabelPreReleaseWeight.HasValue)
             throw new Exception("Configuration value for 'LabelPreReleaseWeight' has no value. (this should not happen, please report an issue)");
 
-        RemoteNameInGit = configuration.RemoteNameInGit;
         AssemblyVersioningScheme = configuration.AssemblyVersioningScheme.Value;
         AssemblyFileVersioningScheme = configuration.AssemblyFileVersioningScheme.Value;
         AssemblyInformationalFormat = configuration.AssemblyInformationalFormat;
@@ -69,8 +68,7 @@ public EffectiveConfiguration(GitVersionConfiguration configuration, BranchConfi
         LabelPreReleaseWeight = configuration.LabelPreReleaseWeight.Value;
     }
 
-    protected EffectiveConfiguration(string remoteNameInGit,
-        AssemblyVersioningScheme assemblyVersioningScheme,
+    protected EffectiveConfiguration(AssemblyVersioningScheme assemblyVersioningScheme,
         AssemblyFileVersioningScheme assemblyFileVersioningScheme,
         string? assemblyInformationalFormat,
         string? assemblyVersioningFormat,
@@ -99,7 +97,6 @@ protected EffectiveConfiguration(string remoteNameInGit,
         int preReleaseWeight,
         int labelPreReleaseWeight)
     {
-        RemoteNameInGit = remoteNameInGit;
         AssemblyVersioningScheme = assemblyVersioningScheme;
         AssemblyFileVersioningScheme = assemblyFileVersioningScheme;
         AssemblyInformationalFormat = assemblyInformationalFormat;
@@ -130,7 +127,6 @@ protected EffectiveConfiguration(string remoteNameInGit,
         LabelPreReleaseWeight = labelPreReleaseWeight;
     }
 
-    public string? RemoteNameInGit { get; }
     public bool TracksReleaseBranches { get; }
     public bool IsReleaseBranch { get; }
     public bool IsMainline { get; }
diff --git a/src/GitVersion.Core/Configuration/GitFlowConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/GitFlowConfigurationBuilder.cs
@@ -11,7 +11,6 @@ private GitFlowConfigurationBuilder()
     {
         WithConfiguration(new()
         {
-            RemoteNameInGit = GitVersionConfiguration.DefaultRemoteNameInGit,
             AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
             CommitDateFormat = "yyyy-MM-dd",
diff --git a/src/GitVersion.Core/Configuration/GitHubFlowConfigurationBuilder.cs b/src/GitVersion.Core/Configuration/GitHubFlowConfigurationBuilder.cs
@@ -11,7 +11,6 @@ private GitHubFlowConfigurationBuilder()
     {
         WithConfiguration(new()
         {
-            RemoteNameInGit = GitVersionConfiguration.DefaultRemoteNameInGit,
             AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,
             AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,
             CommitDateFormat = "yyyy-MM-dd",
diff --git a/src/GitVersion.Core/Core/GitVersionContextFactory.cs b/src/GitVersion.Core/Core/GitVersionContextFactory.cs
@@ -26,17 +26,6 @@ public GitVersionContext Create(GitVersionOptions gitVersionOptions)
             currentBranch = branchForCommit ?? currentBranch;
         }
 
-        if (currentBranch.IsRemote)
-        {
-            var remoteNameInGit = configuration.RemoteNameInGit;
-            if (string.IsNullOrEmpty(remoteNameInGit) || !currentBranch.Name.Friendly.StartsWith(remoteNameInGit))
-            {
-                throw new InvalidOperationException(
-                    $"The remote branch name '{currentBranch.Name.Friendly}' is not valid. Please use another branch or change the configuration."
-                );
-            }
-        }
-
         var currentCommitTaggedVersion = this.repositoryStore.GetCurrentCommitTaggedVersion(currentCommit, configuration.LabelPrefix, configuration.SemanticVersionFormat, handleDetachedBranch: currentBranch.IsDetachedHead);
         var numberOfUncommittedChanges = this.repositoryStore.GetNumberOfUncommittedChanges();
 
diff --git a/src/GitVersion.Core/PublicAPI.Unshipped.txt b/src/GitVersion.Core/PublicAPI.Unshipped.txt
@@ -165,7 +165,7 @@ GitVersion.Configuration.EffectiveConfiguration.BranchPrefixToTrim.get -> string
 GitVersion.Configuration.EffectiveConfiguration.CommitDateFormat.get -> string?
 GitVersion.Configuration.EffectiveConfiguration.CommitMessageIncrementing.get -> GitVersion.VersionCalculation.CommitMessageIncrementMode
 GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Configuration.GitVersionConfiguration! configuration, GitVersion.Configuration.BranchConfiguration! branchConfiguration) -> void
-GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(string! remoteNameInGit, GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? labelPrefix, string! label, string? nextVersion, GitVersion.IncrementStrategy increment, string? branchPrefixToTrim, bool preventIncrementOfMergedBranchVersion, string? labelNumberPattern, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>! versionFilters, bool tracksReleaseBranches, bool isReleaseBranch, bool isMainline, string? commitDateFormat, bool updateBuildNumber, GitVersion.SemanticVersionFormat semanticVersionFormat, int preReleaseWeight, int labelPreReleaseWeight) -> void
+GitVersion.Configuration.EffectiveConfiguration.EffectiveConfiguration(GitVersion.Extensions.AssemblyVersioningScheme assemblyVersioningScheme, GitVersion.Extensions.AssemblyFileVersioningScheme assemblyFileVersioningScheme, string? assemblyInformationalFormat, string? assemblyVersioningFormat, string? assemblyFileVersioningFormat, GitVersion.VersionCalculation.VersioningMode versioningMode, string? labelPrefix, string! label, string? nextVersion, GitVersion.IncrementStrategy increment, string? branchPrefixToTrim, bool preventIncrementOfMergedBranchVersion, string? labelNumberPattern, bool trackMergeTarget, string? majorVersionBumpMessage, string? minorVersionBumpMessage, string? patchVersionBumpMessage, string? noBumpMessage, GitVersion.VersionCalculation.CommitMessageIncrementMode commitMessageIncrementing, System.Collections.Generic.IEnumerable<GitVersion.VersionCalculation.IVersionFilter!>! versionFilters, bool tracksReleaseBranches, bool isReleaseBranch, bool isMainline, string? commitDateFormat, bool updateBuildNumber, GitVersion.SemanticVersionFormat semanticVersionFormat, int preReleaseWeight, int labelPreReleaseWeight) -> void
 GitVersion.Configuration.EffectiveConfiguration.Increment.get -> GitVersion.IncrementStrategy
 GitVersion.Configuration.EffectiveConfiguration.IsMainline.get -> bool
 GitVersion.Configuration.EffectiveConfiguration.IsReleaseBranch.get -> bool
@@ -180,7 +180,6 @@ GitVersion.Configuration.EffectiveConfiguration.NoBumpMessage.get -> string?
 GitVersion.Configuration.EffectiveConfiguration.PatchVersionBumpMessage.get -> string?
 GitVersion.Configuration.EffectiveConfiguration.PreReleaseWeight.get -> int
 GitVersion.Configuration.EffectiveConfiguration.PreventIncrementOfMergedBranchVersion.get -> bool
-GitVersion.Configuration.EffectiveConfiguration.RemoteNameInGit.get -> string?
 GitVersion.Configuration.EffectiveConfiguration.SemanticVersionFormat.get -> GitVersion.SemanticVersionFormat
 GitVersion.Configuration.EffectiveConfiguration.SemanticVersionFormat.set -> void
 GitVersion.Configuration.EffectiveConfiguration.TrackMergeMessage.get -> bool
@@ -207,9 +206,9 @@ GitVersion.Configuration.GitVersionConfiguration.CommitDateFormat.set -> void
 GitVersion.Configuration.GitVersionConfiguration.GitVersionConfiguration() -> void
 GitVersion.Configuration.GitVersionConfiguration.Ignore.get -> GitVersion.Configuration.IgnoreConfiguration!
 GitVersion.Configuration.GitVersionConfiguration.Ignore.set -> void
-GitVersion.Configuration.GitVersionConfiguration.LabelPrefix.get -> string?
 GitVersion.Configuration.GitVersionConfiguration.LabelPreReleaseWeight.get -> int?
 GitVersion.Configuration.GitVersionConfiguration.LabelPreReleaseWeight.set -> void
+GitVersion.Configuration.GitVersionConfiguration.LabelPrefix.get -> string?
 GitVersion.Configuration.GitVersionConfiguration.LabelPrefix.set -> void
 GitVersion.Configuration.GitVersionConfiguration.MajorVersionBumpMessage.get -> string?
 GitVersion.Configuration.GitVersionConfiguration.MajorVersionBumpMessage.set -> void
@@ -223,8 +222,6 @@ GitVersion.Configuration.GitVersionConfiguration.NoBumpMessage.get -> string?
 GitVersion.Configuration.GitVersionConfiguration.NoBumpMessage.set -> void
 GitVersion.Configuration.GitVersionConfiguration.PatchVersionBumpMessage.get -> string?
 GitVersion.Configuration.GitVersionConfiguration.PatchVersionBumpMessage.set -> void
-GitVersion.Configuration.GitVersionConfiguration.RemoteNameInGit.get -> string?
-GitVersion.Configuration.GitVersionConfiguration.RemoteNameInGit.set -> void
 GitVersion.Configuration.GitVersionConfiguration.SemanticVersionFormat.get -> GitVersion.SemanticVersionFormat
 GitVersion.Configuration.GitVersionConfiguration.SemanticVersionFormat.set -> void
 GitVersion.Configuration.GitVersionConfiguration.UpdateBuildNumber.get -> bool
diff --git a/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs
@@ -442,7 +442,7 @@ private void VerifyAssemblyInfoFile(
             this.fileSystem.ReadAllText(fileName).Returns(assemblyFileContent);
         });
 
-        var configuration = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
+        var configuration = new TestEffectiveConfiguration(versioningScheme);
         var variables = this.variableProvider.GetVariablesFor(version, configuration, false);
 
         verify?.Invoke(this.fileSystem, variables);
diff --git a/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/ProjectFileUpdaterTests.cs
@@ -300,7 +300,7 @@ private void VerifyAssemblyInfoFile(
             this.fileSystem.ReadAllText(fileName).Returns(projectFileContent);
         });
 
-        var configuration = new TestEffectiveConfiguration(assemblyVersioningScheme: versioningScheme);
+        var configuration = new TestEffectiveConfiguration(versioningScheme);
         var variables = this.variableProvider.GetVariablesFor(version, configuration, false);
 
         verify?.Invoke(this.fileSystem, variables);

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-remote-name-in-git: origin`
`2`	`1`	`assembly-versioning-scheme: MajorMinorPatch`
`3`	`2`	`assembly-file-versioning-scheme: MajorMinorPatch`
`4`	`3`	`label-prefix: '[vV]?'`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,6 @@ namespace GitVersion.Configuration;`
`6`	`6`	`internal abstract class ConfigurationBuilderBase<TConfigurationBuilder>`
`7`	`7`	`where TConfigurationBuilder : ConfigurationBuilderBase<TConfigurationBuilder>`
`8`	`8`	`{`
`9`		`- private string? remoteNameInGit;`
`10`	`9`	`private AssemblyVersioningScheme? assemblyVersioningScheme;`
`11`	`10`	`private AssemblyFileVersioningScheme? assemblyFileVersioningScheme;`
`12`	`11`	`private string? assemblyInformationalFormat;`
`@@ -98,13 +97,6 @@ protected ConfigurationBuilderBase()`
`98`	`97`	`}`
`99`	`98`	`}`
`100`	`99`
`101`		`- public virtual TConfigurationBuilder WithRemoteNameInGit(string? value)`
`102`		`- {`
`103`		`- this.remoteNameInGit = value;`
`104`		`- return (TConfigurationBuilder)this;`
`105`		`- }`
`106`		`-`
`107`		`-`
`108`	`100`	`public virtual TConfigurationBuilder WithAssemblyVersioningScheme(AssemblyVersioningScheme? value)`
`109`	`101`	`{`
`110`	`102`	`this.assemblyVersioningScheme = value;`
`@@ -332,7 +324,6 @@ public virtual TConfigurationBuilder WithPreReleaseWeight(int? value)`
`332`	`324`
`333`	`325`	`public virtual TConfigurationBuilder WithConfiguration(GitVersionConfiguration value)`
`334`	`326`	`{`
`335`		`- WithRemoteNameInGit(value.RemoteNameInGit);`
`336`	`327`	`WithAssemblyVersioningScheme(value.AssemblyVersioningScheme);`
`337`	`328`	`WithAssemblyFileVersioningScheme(value.AssemblyFileVersioningScheme);`
`338`	`329`	`WithAssemblyInformationalFormat(value.AssemblyInformationalFormat);`
`@@ -385,7 +376,6 @@ public virtual GitVersionConfiguration Build()`
`385`	`376`	`{`
`386`	`377`	`GitVersionConfiguration configuration = new()`
`387`	`378`	`{`
`388`		`- RemoteNameInGit = this.remoteNameInGit,`
`389`	`379`	`AssemblyVersioningScheme = this.assemblyVersioningScheme,`
`390`	`380`	`AssemblyFileVersioningScheme = this.assemblyFileVersioningScheme,`
`391`	`381`	`AssemblyInformationalFormat = this.assemblyInformationalFormat,`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ private GitFlowConfigurationBuilder()`
`11`	`11`	`{`
`12`	`12`	`WithConfiguration(new()`
`13`	`13`	`{`
`14`		`- RemoteNameInGit = GitVersionConfiguration.DefaultRemoteNameInGit,`
`15`	`14`	`AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,`
`16`	`15`	`AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,`
`17`	`16`	`CommitDateFormat = "yyyy-MM-dd",`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ private GitHubFlowConfigurationBuilder()`
`11`	`11`	`{`
`12`	`12`	`WithConfiguration(new()`
`13`	`13`	`{`
`14`		`- RemoteNameInGit = GitVersionConfiguration.DefaultRemoteNameInGit,`
`15`	`14`	`AssemblyFileVersioningScheme = AssemblyFileVersioningScheme.MajorMinorPatch,`
`16`	`15`	`AssemblyVersioningScheme = AssemblyVersioningScheme.MajorMinorPatch,`
`17`	`16`	`CommitDateFormat = "yyyy-MM-dd",`