remove libgit obsoletes

SimonCropp · SimonCropp · commit adcf9bfcabdb · 2016-04-06T22:27:07.000+10:00
diff --git a/src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/HotfixBranchScenarios.cs
@@ -57,7 +57,7 @@ public void CanTakeVersionFromHotfixesBranch()
 
             // Merge hotfix branch to support
             fixture.Repository.Checkout("master");
-            fixture.Repository.Checkout(fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.Name == "1.1.0").Target));
+            fixture.Repository.Checkout(fixture.Repository.CreateBranch("support-1.1", (Commit)fixture.Repository.Tags.Single(t => t.FriendlyName == "1.1.0").Target));
             fixture.AssertFullSemver("1.1.0");
 
             // create hotfix branch
diff --git a/src/GitVersionCore.Tests/Mocks/MockBranch.cs b/src/GitVersionCore.Tests/Mocks/MockBranch.cs
@@ -23,7 +23,7 @@ public MockBranch()
     MockCommitLog commits = new MockCommitLog();
     string name;
     string canonicalName;
-    public override string Name { get { return name; } }
+    public override string FriendlyName { get { return name; } }
     public override ICommitLog Commits { get { return commits; } }
     public override Commit Tip { get { return commits.First(); } }
     public override bool IsTracking { get { return true; } }
diff --git a/src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs b/src/GitVersionCore.Tests/Mocks/MockBranchCollection.cs
@@ -13,7 +13,7 @@ public override IEnumerator<Branch> GetEnumerator()
 
     public override Branch this[string name]
     {
-        get { return Branches.FirstOrDefault(x => x.Name == name); }
+        get { return Branches.FirstOrDefault(x => x.FriendlyName == name); }
     }
 
     public void Add(Branch item)
diff --git a/src/GitVersionCore.Tests/Mocks/MockTag.cs b/src/GitVersionCore.Tests/Mocks/MockTag.cs
@@ -4,7 +4,7 @@ public class MockTag : Tag
 {
 
     public string NameEx;
-    public override string Name
+    public override string FriendlyName
     {
         get { return NameEx; }
     }
diff --git a/src/GitVersionCore/BranchConfigurationCalculator.cs b/src/GitVersionCore/BranchConfigurationCalculator.cs
@@ -35,7 +35,7 @@ public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit c
             }
 
             const string format = "Multiple branch configurations match the current branch branchName of '{0}'. Matching configurations: '{1}'";
-            throw new Exception(string.Format(format, currentBranch.Name, string.Join(", ", matchingBranches.Select(b => b.Key))));
+            throw new Exception(string.Format(format, currentBranch.FriendlyName, string.Join(", ", matchingBranches.Select(b => b.Key))));
         }
 
         static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration([NotNull] Config config, [NotNull] Branch currentBranch)
@@ -50,7 +50,7 @@ static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration([NotNull]
                 throw new ArgumentNullException("currentBranch");
             }
             
-            return config.Branches.Where(b => Regex.IsMatch(currentBranch.Name, "^" + b.Key, RegexOptions.IgnoreCase)).ToArray();
+            return config.Branches.Where(b => Regex.IsMatch(currentBranch.FriendlyName, "^" + b.Key, RegexOptions.IgnoreCase)).ToArray();
         }
 
 
@@ -104,7 +104,7 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
                     }
                 }
 
-                Logger.WriteInfo("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.Name)));
+                Logger.WriteInfo("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.FriendlyName)));
 
                 if (possibleParents.Count == 1)
                 {
@@ -124,14 +124,14 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv
                 if (possibleParents.Count == 0)
                     errorMessage = "Failed to inherit Increment branch configuration, no branches found.";
                 else
-                    errorMessage = "Failed to inherit Increment branch configuration, ended up with: " + string.Join(", ", possibleParents.Select(p => p.Name));
+                    errorMessage = "Failed to inherit Increment branch configuration, ended up with: " + string.Join(", ", possibleParents.Select(p => p.FriendlyName));
 
-                var chosenBranch = repository.Branches.FirstOrDefault(b => Regex.IsMatch(b.Name, "^develop", RegexOptions.IgnoreCase)
-                                                                           || Regex.IsMatch(b.Name, "master$", RegexOptions.IgnoreCase));
+                var chosenBranch = repository.Branches.FirstOrDefault(b => Regex.IsMatch(b.FriendlyName, "^develop", RegexOptions.IgnoreCase)
+                                                                           || Regex.IsMatch(b.FriendlyName, "master$", RegexOptions.IgnoreCase));
                 if (chosenBranch == null)
                     throw new InvalidOperationException("Could not find a 'develop' or 'master' branch, neither locally nor remotely.");
 
-                var branchName = chosenBranch.Name;
+                var branchName = chosenBranch.FriendlyName;
                 Logger.WriteWarning(errorMessage + Environment.NewLine + Environment.NewLine + "Falling back to " + branchName + " branch config");
 
                 var value = GetBranchConfiguration(currentCommit, repository, onlyEvaluateTrackedBranches, config, chosenBranch).Value;
@@ -161,22 +161,22 @@ static Branch[] CalculateWhenMultipleParents(IRepository repository, Commit curr
             }
             else if (branches.Count > 1)
             {
-                currentBranch = branches.FirstOrDefault(b => b.Name == "master") ?? branches.First();
+                currentBranch = branches.FirstOrDefault(b => b.FriendlyName == "master") ?? branches.First();
             }
             else
             {
                 var possibleTargetBranches = repository.Branches.Where(b => !b.IsRemote && b.Tip == parents[0]).ToList();
                 if (possibleTargetBranches.Count > 1)
                 {
-                    currentBranch = possibleTargetBranches.FirstOrDefault(b => b.Name == "master") ?? possibleTargetBranches.First();
+                    currentBranch = possibleTargetBranches.FirstOrDefault(b => b.FriendlyName == "master") ?? possibleTargetBranches.First();
                 }
                 else
                 {
                     currentBranch = possibleTargetBranches.FirstOrDefault() ?? currentBranch;
                 }
             }
 
-            Logger.WriteInfo("HEAD is merge commit, this is likely a pull request using " + currentBranch.Name + " as base");
+            Logger.WriteInfo("HEAD is merge commit, this is likely a pull request using " + currentBranch.FriendlyName + " as base");
 
             return excludedBranches;
         }
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -61,7 +61,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co
                 .SelectMany(t =>
                 {
                     SemanticVersion version;
-                    if (t.PeeledTarget() == CurrentCommit && SemanticVersion.TryParse(t.Name, Configuration.GitTagPrefix, out version))
+                    if (t.PeeledTarget() == CurrentCommit && SemanticVersion.TryParse(t.FriendlyName, Configuration.GitTagPrefix, out version))
                         return new[] { version };
                     return new SemanticVersion[0];
                 })
diff --git a/src/GitVersionCore/GitVersionFinder.cs b/src/GitVersionCore/GitVersionFinder.cs
@@ -8,7 +8,7 @@ public class GitVersionFinder
     {
         public SemanticVersion FindVersion(GitVersionContext context)
         {
-            Logger.WriteInfo(string.Format("Running against branch: {0} ({1})", context.CurrentBranch.Name, context.CurrentCommit.Sha));
+            Logger.WriteInfo(string.Format("Running against branch: {0} ({1})", context.CurrentBranch.FriendlyName, context.CurrentCommit.Sha));
             EnsureMainTopologyConstraints(context);
 
             var filePath = Path.Combine(context.Repository.GetRepositoryDirectory(), "NextVersion.txt");
diff --git a/src/GitVersionCore/IncrementStrategyFinder.cs b/src/GitVersionCore/IncrementStrategyFinder.cs
@@ -87,7 +87,7 @@ private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Comm
             {
                 var filter = new CommitFilter
                 {
-                    Since = headCommit,
+                    IncludeReachableFrom = headCommit,
                     SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Reverse
                 };
 
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/TaggedCommitVersionStrategy.cs
@@ -21,11 +21,11 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
                 .Select(t =>
                 {
                     SemanticVersion version;
-                    if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))
+                    if (SemanticVersion.TryParse(t.FriendlyName, context.Configuration.GitTagPrefix, out version))
                     {
                         var commit = t.PeeledTarget() as Commit;
                         if (commit != null)
-                            return new VersionTaggedCommit(commit, version, t.Name);
+                            return new VersionTaggedCommit(commit, version, t.FriendlyName);
                     }
                     return null;
                 })
diff --git a/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/BaseVersionCalculators/VersionInBranchBaseVersionStrategy.cs
@@ -11,14 +11,14 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
             if (versionInBranch != null)
             {
                 var commitBranchWasBranchedFrom = context.CurrentBranch.FindCommitBranchWasBranchedFrom(context.Repository);
-                var branchNameOverride = context.CurrentBranch.Name.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
+                var branchNameOverride = context.CurrentBranch.FriendlyName.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);
                 yield return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom, branchNameOverride);
             }
         }
 
         Tuple<string, SemanticVersion> GetVersionInBranch(GitVersionContext context)
         {
-            var branchParts = context.CurrentBranch.Name.Split('/', '-');
+            var branchParts = context.CurrentBranch.FriendlyName.Split('/', '-');
             foreach (var part in branchParts)
             {
                 SemanticVersion semanticVersion;
diff --git a/src/GitVersionCore/VersionCalculation/FallbackBaseVersionStrategy.cs b/src/GitVersionCore/VersionCalculation/FallbackBaseVersionStrategy.cs
@@ -11,7 +11,7 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)
         {
             var baseVersionSource = context.Repository.Commits.QueryBy(new CommitFilter
             {
-                Since = context.CurrentBranch.Tip
+                IncludeReachableFrom = context.CurrentBranch.Tip
             }).First(c => !c.Parents.Any());
             yield return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), baseVersionSource, null);
         }
diff --git a/src/GitVersionCore/VersionCalculation/MetaDataCalculator.cs b/src/GitVersionCore/VersionCalculation/MetaDataCalculator.cs
@@ -9,8 +9,8 @@ public SemanticVersionBuildMetaData Create(Commit baseVersionSource, GitVersionC
         {
             var qf = new CommitFilter
             {
-                Since = context.CurrentCommit,
-                Until = baseVersionSource,
+                IncludeReachableFrom = context.CurrentCommit,
+                ExcludeReachableFrom = baseVersionSource,
                 SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
             };
 
@@ -20,7 +20,7 @@ public SemanticVersionBuildMetaData Create(Commit baseVersionSource, GitVersionC
 
             return new SemanticVersionBuildMetaData(
                 commitsSinceTag,
-                context.CurrentBranch.Name,
+                context.CurrentBranch.FriendlyName,
                 context.CurrentCommit.Sha,
                 context.CurrentCommit.When());
         }
diff --git a/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs b/src/GitVersionCore/VersionCalculation/NextVersionCalculator.cs
@@ -77,7 +77,7 @@ void UpdatePreReleaseTag(GitVersionContext context, SemanticVersion semanticVers
             {
                 Logger.WriteInfo("Using branch name to calculate version tag");
 
-                var branchName = branchNameOverride ?? context.CurrentBranch.Name;
+                var branchName = branchNameOverride ?? context.CurrentBranch.FriendlyName;
                 if (!string.IsNullOrWhiteSpace(context.Configuration.BranchPrefixToTrim))
                 {
                     branchName = branchName.RegexReplace(context.Configuration.BranchPrefixToTrim, string.Empty, RegexOptions.IgnoreCase);
diff --git a/src/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs b/src/GitVersionCore/VersioningModes/ContinuousDeliveryMode.cs
@@ -16,7 +16,7 @@ static SemanticVersionPreReleaseTag RetrieveMostRecentOptionalTagVersion(GitVers
             if (applicableTagsInDescendingOrder.Any())
             {
                 var taggedCommit = applicableTagsInDescendingOrder.First().PeeledTarget();
-                var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.Name, context.Configuration.GitTagPrefix)).FirstOrDefault();
+                var preReleaseVersion = applicableTagsInDescendingOrder.Select(tag => SemanticVersion.Parse(tag.FriendlyName, context.Configuration.GitTagPrefix)).FirstOrDefault();
                 if (preReleaseVersion != null)
                 {
                     if (taggedCommit != context.CurrentCommit)

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ public override IEnumerator<Branch> GetEnumerator()`
`13`	`13`
`14`	`14`	`public override Branch this[string name]`
`15`	`15`	`{`
`16`		`- get { return Branches.FirstOrDefault(x => x.Name == name); }`
	`16`	`+ get { return Branches.FirstOrDefault(x => x.FriendlyName == name); }`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`public void Add(Branch item)`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ public class MockTag : Tag`
`4`	`4`	`{`
`5`	`5`
`6`	`6`	`public string NameEx;`
`7`		`- public override string Name`
	`7`	`+ public override string FriendlyName`
`8`	`8`	`{`
`9`	`9`	`get { return NameEx; }`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit c`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`const string format = "Multiple branch configurations match the current branch branchName of '{0}'. Matching configurations: '{1}'";`
`38`		`- throw new Exception(string.Format(format, currentBranch.Name, string.Join(", ", matchingBranches.Select(b => b.Key))));`
	`38`	`+ throw new Exception(string.Format(format, currentBranch.FriendlyName, string.Join(", ", matchingBranches.Select(b => b.Key))));`
`39`	`39`	`}`
`40`	`40`
`41`	`41`	`static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration([NotNull] Config config, [NotNull] Branch currentBranch)`
`@@ -50,7 +50,7 @@ static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration([NotNull]`
`50`	`50`	`throw new ArgumentNullException("currentBranch");`
`51`	`51`	`}`
`52`	`52`
`53`		`- return config.Branches.Where(b => Regex.IsMatch(currentBranch.Name, "^" + b.Key, RegexOptions.IgnoreCase)).ToArray();`
	`53`	`+ return config.Branches.Where(b => Regex.IsMatch(currentBranch.FriendlyName, "^" + b.Key, RegexOptions.IgnoreCase)).ToArray();`
`54`	`54`	`}`
`55`	`55`
`56`	`56`
`@@ -104,7 +104,7 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv`
`104`	`104`	`}`
`105`	`105`	`}`
`106`	`106`
`107`		`- Logger.WriteInfo("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.Name)));`
	`107`	`+ Logger.WriteInfo("Found possible parent branches: " + string.Join(", ", possibleParents.Select(p => p.FriendlyName)));`
`108`	`108`
`109`	`109`	`if (possibleParents.Count == 1)`
`110`	`110`	`{`
`@@ -124,14 +124,14 @@ static KeyValuePair<string, BranchConfig> InheritBranchConfiguration(bool onlyEv`
`124`	`124`	`if (possibleParents.Count == 0)`
`125`	`125`	`errorMessage = "Failed to inherit Increment branch configuration, no branches found.";`
`126`	`126`	`else`
`127`		`- errorMessage = "Failed to inherit Increment branch configuration, ended up with: " + string.Join(", ", possibleParents.Select(p => p.Name));`
	`127`	`+ errorMessage = "Failed to inherit Increment branch configuration, ended up with: " + string.Join(", ", possibleParents.Select(p => p.FriendlyName));`
`128`	`128`
`129`		`- var chosenBranch = repository.Branches.FirstOrDefault(b => Regex.IsMatch(b.Name, "^develop", RegexOptions.IgnoreCase)`
`130`		`- \|\| Regex.IsMatch(b.Name, "master$", RegexOptions.IgnoreCase));`
	`129`	`+ var chosenBranch = repository.Branches.FirstOrDefault(b => Regex.IsMatch(b.FriendlyName, "^develop", RegexOptions.IgnoreCase)`
	`130`	`+ \|\| Regex.IsMatch(b.FriendlyName, "master$", RegexOptions.IgnoreCase));`
`131`	`131`	`if (chosenBranch == null)`
`132`	`132`	`throw new InvalidOperationException("Could not find a 'develop' or 'master' branch, neither locally nor remotely.");`
`133`	`133`
`134`		`- var branchName = chosenBranch.Name;`
	`134`	`+ var branchName = chosenBranch.FriendlyName;`
`135`	`135`	`Logger.WriteWarning(errorMessage + Environment.NewLine + Environment.NewLine + "Falling back to " + branchName + " branch config");`
`136`	`136`
`137`	`137`	`var value = GetBranchConfiguration(currentCommit, repository, onlyEvaluateTrackedBranches, config, chosenBranch).Value;`
`@@ -161,22 +161,22 @@ static Branch[] CalculateWhenMultipleParents(IRepository repository, Commit curr`
`161`	`161`	`}`
`162`	`162`	`else if (branches.Count > 1)`
`163`	`163`	`{`
`164`		`- currentBranch = branches.FirstOrDefault(b => b.Name == "master") ?? branches.First();`
	`164`	`+ currentBranch = branches.FirstOrDefault(b => b.FriendlyName == "master") ?? branches.First();`
`165`	`165`	`}`
`166`	`166`	`else`
`167`	`167`	`{`
`168`	`168`	`var possibleTargetBranches = repository.Branches.Where(b => !b.IsRemote && b.Tip == parents[0]).ToList();`
`169`	`169`	`if (possibleTargetBranches.Count > 1)`
`170`	`170`	`{`
`171`		`- currentBranch = possibleTargetBranches.FirstOrDefault(b => b.Name == "master") ?? possibleTargetBranches.First();`
	`171`	`+ currentBranch = possibleTargetBranches.FirstOrDefault(b => b.FriendlyName == "master") ?? possibleTargetBranches.First();`
`172`	`172`	`}`
`173`	`173`	`else`
`174`	`174`	`{`
`175`	`175`	`currentBranch = possibleTargetBranches.FirstOrDefault() ?? currentBranch;`
`176`	`176`	`}`
`177`	`177`	`}`
`178`	`178`
`179`		`- Logger.WriteInfo("HEAD is merge commit, this is likely a pull request using " + currentBranch.Name + " as base");`
	`179`	`+ Logger.WriteInfo("HEAD is merge commit, this is likely a pull request using " + currentBranch.FriendlyName + " as base");`
`180`	`180`
`181`	`181`	`return excludedBranches;`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ public GitVersionContext(IRepository repository, Branch currentBranch, Config co`
`61`	`61`	`.SelectMany(t =>`
`62`	`62`	`{`
`63`	`63`	`SemanticVersion version;`
`64`		`- if (t.PeeledTarget() == CurrentCommit && SemanticVersion.TryParse(t.Name, Configuration.GitTagPrefix, out version))`
	`64`	`+ if (t.PeeledTarget() == CurrentCommit && SemanticVersion.TryParse(t.FriendlyName, Configuration.GitTagPrefix, out version))`
`65`	`65`	`return new[] { version };`
`66`	`66`	`return new SemanticVersion[0];`
`67`	`67`	`})`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ public class GitVersionFinder`
`8`	`8`	`{`
`9`	`9`	`public SemanticVersion FindVersion(GitVersionContext context)`
`10`	`10`	`{`
`11`		`- Logger.WriteInfo(string.Format("Running against branch: {0} ({1})", context.CurrentBranch.Name, context.CurrentCommit.Sha));`
	`11`	`+ Logger.WriteInfo(string.Format("Running against branch: {0} ({1})", context.CurrentBranch.FriendlyName, context.CurrentCommit.Sha));`
`12`	`12`	`EnsureMainTopologyConstraints(context);`
`13`	`13`
`14`	`14`	`var filePath = Path.Combine(context.Repository.GetRepositoryDirectory(), "NextVersion.txt");`
Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,7 @@ private static IEnumerable<Commit> GetIntermediateCommits(IRepository repo, Comm`
`87`	`87`	`{`
`88`	`88`	`var filter = new CommitFilter`
`89`	`89`	`{`
`90`		`- Since = headCommit,`
	`90`	`+ IncludeReachableFrom = headCommit,`
`91`	`91`	`SortBy = CommitSortStrategies.Topological \| CommitSortStrategies.Reverse`
`92`	`92`	`};`
`93`	`93`
Original file line number	Diff line number	Diff line change
`@@ -21,11 +21,11 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)`
`21`	`21`	`.Select(t =>`
`22`	`22`	`{`
`23`	`23`	`SemanticVersion version;`
`24`		`- if (SemanticVersion.TryParse(t.Name, context.Configuration.GitTagPrefix, out version))`
	`24`	`+ if (SemanticVersion.TryParse(t.FriendlyName, context.Configuration.GitTagPrefix, out version))`
`25`	`25`	`{`
`26`	`26`	`var commit = t.PeeledTarget() as Commit;`
`27`	`27`	`if (commit != null)`
`28`		`- return new VersionTaggedCommit(commit, version, t.Name);`
	`28`	`+ return new VersionTaggedCommit(commit, version, t.FriendlyName);`
`29`	`29`	`}`
`30`	`30`	`return null;`
`31`	`31`	`})`
Original file line number	Diff line number	Diff line change
`@@ -11,14 +11,14 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)`
`11`	`11`	`if (versionInBranch != null)`
`12`	`12`	`{`
`13`	`13`	`var commitBranchWasBranchedFrom = context.CurrentBranch.FindCommitBranchWasBranchedFrom(context.Repository);`
`14`		`- var branchNameOverride = context.CurrentBranch.Name.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);`
	`14`	`+ var branchNameOverride = context.CurrentBranch.FriendlyName.RegexReplace("[-/]" + versionInBranch.Item1, string.Empty);`
`15`	`15`	`yield return new BaseVersion("Version in branch name", false, versionInBranch.Item2, commitBranchWasBranchedFrom, branchNameOverride);`
`16`	`16`	`}`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`Tuple<string, SemanticVersion> GetVersionInBranch(GitVersionContext context)`
`20`	`20`	`{`
`21`		`- var branchParts = context.CurrentBranch.Name.Split('/', '-');`
	`21`	`+ var branchParts = context.CurrentBranch.FriendlyName.Split('/', '-');`
`22`	`22`	`foreach (var part in branchParts)`
`23`	`23`	`{`
`24`	`24`	`SemanticVersion semanticVersion;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ public override IEnumerable<BaseVersion> GetVersions(GitVersionContext context)`
`11`	`11`	`{`
`12`	`12`	`var baseVersionSource = context.Repository.Commits.QueryBy(new CommitFilter`
`13`	`13`	`{`
`14`		`- Since = context.CurrentBranch.Tip`
	`14`	`+ IncludeReachableFrom = context.CurrentBranch.Tip`
`15`	`15`	`}).First(c => !c.Parents.Any());`
`16`	`16`	`yield return new BaseVersion("Fallback base version", false, new SemanticVersion(minor: 1), baseVersionSource, null);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,8 +9,8 @@ public SemanticVersionBuildMetaData Create(Commit baseVersionSource, GitVersionC`
`9`	`9`	`{`
`10`	`10`	`var qf = new CommitFilter`
`11`	`11`	`{`
`12`		`- Since = context.CurrentCommit,`
`13`		`- Until = baseVersionSource,`
	`12`	`+ IncludeReachableFrom = context.CurrentCommit,`
	`13`	`+ ExcludeReachableFrom = baseVersionSource,`
`14`	`14`	`SortBy = CommitSortStrategies.Topological \| CommitSortStrategies.Time`
`15`	`15`	`};`
`16`	`16`
`@@ -20,7 +20,7 @@ public SemanticVersionBuildMetaData Create(Commit baseVersionSource, GitVersionC`
`20`	`20`
`21`	`21`	`return new SemanticVersionBuildMetaData(`
`22`	`22`	`commitsSinceTag,`
`23`		`- context.CurrentBranch.Name,`
	`23`	`+ context.CurrentBranch.FriendlyName,`
`24`	`24`	`context.CurrentCommit.Sha,`
`25`	`25`	`context.CurrentCommit.When());`
`26`	`26`	`}`