removed the NameWithoutOrigin from IBranch as it is used only in one …

…place
GitTools · Jan 19, 2021 · 0a707b6 · 0a707b6
1 parent 41d4f52
commit 0a707b6
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/src/GitVersion.LibGit2Sharp/Git/Branch.cs b/src/GitVersion.LibGit2Sharp/Git/Branch.cs
@@ -26,11 +26,6 @@ internal sealed class Branch : IBranch
                 ? FriendlyName.Substring(FriendlyName.IndexOf("/", StringComparison.Ordinal) + 1)
                 : FriendlyName;
 
-        public string NameWithoutOrigin =>
-            IsRemote && FriendlyName.StartsWith("origin/")
-                ? FriendlyName.Substring("origin/".Length)
-                : FriendlyName;
-
         public ICommit? Tip
         {
             get

diff --git a/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs
@@ -42,7 +42,6 @@ public static IBranch CreateMockBranch(string name, params ICommit[] commits)
             var branch = Substitute.For<IBranch>();
             branch.FriendlyName.Returns(name);
             branch.CanonicalName.Returns(name);
-            branch.NameWithoutOrigin.Returns(name);
             branch.NameWithoutRemote.Returns(name);
             branch.IsTracking.Returns(true);
             branch.IsRemote.Returns(false);

diff --git a/src/GitVersionCore/Git/IBranch.cs b/src/GitVersionCore/Git/IBranch.cs
@@ -7,7 +7,6 @@ public interface IBranch : IEquatable<IBranch>, IComparable<IBranch>
         string CanonicalName { get; }
         string FriendlyName { get; }
         string NameWithoutRemote { get; }
-        string NameWithoutOrigin { get; }
         ICommit Tip { get; }
         bool IsRemote { get; }
         bool IsTracking { get; }

diff --git a/src/GitVersionCore/Git/ITag.cs b/src/GitVersionCore/Git/ITag.cs
@@ -2,7 +2,7 @@
 
 namespace GitVersion
 {
-    public interface ITag: IEquatable<ITag>, IComparable<ITag>
+    public interface ITag : IEquatable<ITag>, IComparable<ITag>
     {
         string TargetSha { get; }
         string FriendlyName { get; }

diff --git a/...rsionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs b/...rsionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs
@@ -29,7 +29,7 @@ public override IEnumerable<BaseVersion> GetVersions()
 
         internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, IBranch currentBranch)
         {
-            if (!Context.FullConfiguration.IsReleaseBranch(currentBranch.NameWithoutOrigin))
+            if (!Context.FullConfiguration.IsReleaseBranch(NameWithoutOrigin(currentBranch)))
             {
                 yield break;
             }
@@ -44,7 +44,7 @@ internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, IBranch cur
             }
         }
 
-        private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex)
+        private static Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex)
         {
             var branchParts = branchName.Split('/', '-');
             foreach (var part in branchParts)
@@ -57,5 +57,12 @@ private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, str
 
             return null;
         }
+
+        private static string NameWithoutOrigin(IBranch branch)
+        {
+            return branch.IsRemote && branch.FriendlyName.StartsWith("origin/")
+                ? branch.FriendlyName.Substring("origin/".Length)
+                : branch.FriendlyName;
+        }
     }
 }