Skip to content

Commit 0a707b6

Browse files
committed
removed the NameWithoutOrigin from IBranch as it is used only in one place
1 parent 41d4f52 commit 0a707b6

File tree

5 files changed

+10
-10
lines changed

5 files changed

+10
-10
lines changed

src/GitVersion.LibGit2Sharp/Git/Branch.cs

-5
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,6 @@ internal sealed class Branch : IBranch
2626
? FriendlyName.Substring(FriendlyName.IndexOf("/", StringComparison.Ordinal) + 1)
2727
: FriendlyName;
2828

29-
public string NameWithoutOrigin =>
30-
IsRemote && FriendlyName.StartsWith("origin/")
31-
? FriendlyName.Substring("origin/".Length)
32-
: FriendlyName;
33-
3429
public ICommit? Tip
3530
{
3631
get

src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public static IBranch CreateMockBranch(string name, params ICommit[] commits)
4242
var branch = Substitute.For<IBranch>();
4343
branch.FriendlyName.Returns(name);
4444
branch.CanonicalName.Returns(name);
45-
branch.NameWithoutOrigin.Returns(name);
4645
branch.NameWithoutRemote.Returns(name);
4746
branch.IsTracking.Returns(true);
4847
branch.IsRemote.Returns(false);

src/GitVersionCore/Git/IBranch.cs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public interface IBranch : IEquatable<IBranch>, IComparable<IBranch>
77
string CanonicalName { get; }
88
string FriendlyName { get; }
99
string NameWithoutRemote { get; }
10-
string NameWithoutOrigin { get; }
1110
ICommit Tip { get; }
1211
bool IsRemote { get; }
1312
bool IsTracking { get; }

src/GitVersionCore/Git/ITag.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
namespace GitVersion
44
{
5-
public interface ITag: IEquatable<ITag>, IComparable<ITag>
5+
public interface ITag : IEquatable<ITag>, IComparable<ITag>
66
{
77
string TargetSha { get; }
88
string FriendlyName { get; }

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchNameVersionStrategy.cs

+9-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public override IEnumerable<BaseVersion> GetVersions()
2929

3030
internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, IBranch currentBranch)
3131
{
32-
if (!Context.FullConfiguration.IsReleaseBranch(currentBranch.NameWithoutOrigin))
32+
if (!Context.FullConfiguration.IsReleaseBranch(NameWithoutOrigin(currentBranch)))
3333
{
3434
yield break;
3535
}
@@ -44,7 +44,7 @@ internal IEnumerable<BaseVersion> GetVersions(string tagPrefixRegex, IBranch cur
4444
}
4545
}
4646

47-
private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex)
47+
private static Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, string tagPrefixRegex)
4848
{
4949
var branchParts = branchName.Split('/', '-');
5050
foreach (var part in branchParts)
@@ -57,5 +57,12 @@ private Tuple<string, SemanticVersion> GetVersionInBranch(string branchName, str
5757

5858
return null;
5959
}
60+
61+
private static string NameWithoutOrigin(IBranch branch)
62+
{
63+
return branch.IsRemote && branch.FriendlyName.StartsWith("origin/")
64+
? branch.FriendlyName.Substring("origin/".Length)
65+
: branch.FriendlyName;
66+
}
6067
}
6168
}

0 commit comments

Comments
 (0)