Merge branch 'master' into fix/newtonsoft.json-usage

asbjornu · web-flow · commit ecc92e2488bb · 2020-01-20T01:30:43.000+01:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -20,14 +20,14 @@
         <PackageVersion_LibGit2Sharp>0.26.2</PackageVersion_LibGit2Sharp>
         <PackageVersion_LibGit2Sharp_NativeBinaries>2.0.306</PackageVersion_LibGit2Sharp_NativeBinaries>
         <PackageVersion_JetBrainsAnnotations>2019.1.3</PackageVersion_JetBrainsAnnotations>
-        <PackageVersion_YamlDotNet>8.0.0</PackageVersion_YamlDotNet>
+        <PackageVersion_YamlDotNet>8.1.0</PackageVersion_YamlDotNet>
         <PackageVersion_NewtonsoftJson>12.0.3</PackageVersion_NewtonsoftJson>
 
         <PackageVersion_MicrosoftTestSdk>16.4.0</PackageVersion_MicrosoftTestSdk>
         <PackageVersion_NSubstitute>4.2.1</PackageVersion_NSubstitute>
         <PackageVersion_CoverletMsBuild>2.8.0</PackageVersion_CoverletMsBuild>
         <PackageVersion_NUnit>3.12.0</PackageVersion_NUnit>
-        <PackageVersion_NUnit3TestAdapter>3.16.0</PackageVersion_NUnit3TestAdapter>
+        <PackageVersion_NUnit3TestAdapter>3.16.1</PackageVersion_NUnit3TestAdapter>
         <PackageVersion_NunitXmlTestLogger>2.1.41</PackageVersion_NunitXmlTestLogger>
         <PackageVersion_Shouldly>4.0.0-beta0002</PackageVersion_Shouldly>
 
diff --git a/src/GitVersion.sln b/src/GitVersion.sln
@@ -12,7 +12,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 	ProjectSection(SolutionItems) = preProject
 		..\.gitattributes = ..\.gitattributes
 		..\.gitignore = ..\.gitignore
-		..\.travis.yml = ..\.travis.yml
 		..\appveyor.yml = ..\appveyor.yml
 		..\azure-pipelines.yml = ..\azure-pipelines.yml
 		..\BREAKING CHANGES.md = ..\BREAKING CHANGES.md
@@ -23,6 +22,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		..\GitVersion.yml = ..\GitVersion.yml
 		..\LICENSE = ..\LICENSE
 		..\README.md = ..\README.md
+		test.props = test.props
 	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionCore", "GitVersionCore\GitVersionCore.csproj", "{F9741A0D-B9D7-4557-9A1C-A7252C1071F5}"
@@ -31,7 +31,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionExe.Tests", "GitV
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask", "GitVersionTask\GitVersionTask.csproj", "{F7AC0E71-3E9A-4F6D-B986-E004825A48E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GitVersionTask.MsBuild", "GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj", "{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GitVersionTask.MsBuild", "GitVersionTask.MsBuild\GitVersionTask.MsBuild.csproj", "{0F1AEC4E-E81D-4F84-B2E8-3415A1A4DBF4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs b/src/GitVersionCore.Tests/GitToolsTestingExtensions.cs
@@ -19,7 +19,7 @@ public static class GitToolsTestingExtensions
 
         static GitToolsTestingExtensions() => sp = ConfigureService();
 
-        public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true, string targetBranch = null)
+        public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)
         {
             if (configuration == null)
             {
@@ -31,7 +31,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
             var variableProvider = sp.GetService<IVariableProvider>();
             var versionFinder = sp.GetService<IGitVersionFinder>();
 
-            var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);
+            var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, onlyTrackedBranches, commitId);
             var executeGitVersion = versionFinder.FindVersion(gitVersionContext);
             var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);
 
@@ -47,19 +47,19 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
             }
         }
 
-        public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true, string targetBranch = null)
+        public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)
         {
-            fixture.AssertFullSemver(new Config(), fullSemver, repository, commitId, isForTrackedBranchOnly, targetBranch);
+            fixture.AssertFullSemver(new Config(), fullSemver, repository, commitId, onlyTrackedBranches, targetBranch);
         }
 
-        public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config configuration, string fullSemver, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true, string targetBranch = null)
+        public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config configuration, string fullSemver, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)
         {
             configuration.Reset();
             Console.WriteLine("---------");
 
             try
             {
-                var variables = fixture.GetVersion(configuration, repository, commitId, isForTrackedBranchOnly, targetBranch);
+                var variables = fixture.GetVersion(configuration, repository, commitId, onlyTrackedBranches, targetBranch);
                 variables.FullSemVer.ShouldBe(fullSemver);
             }
             catch (Exception)
diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -14,8 +14,8 @@
         <PackageReference Include="FluentDateTime" Version="2.0.0" />
         <PackageReference Include="GitTools.Testing" Version="1.2.0" />
         <PackageReference Include="LibGit2Sharp.NativeBinaries" Version="$(PackageVersion_LibGit2Sharp_NativeBinaries)" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
     <ItemGroup>
diff --git a/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs
@@ -143,7 +143,7 @@ public void WhenDevelopBranchedFromMasterDetachedHeadMinorIsIncreased()
             var commit = fixture.Repository.Head.Tip;
             fixture.Repository.MakeACommit();
             Commands.Checkout(fixture.Repository, commit);
-            fixture.AssertFullSemver("1.1.0-alpha.1");
+            fixture.AssertFullSemver("1.1.0-alpha.1", onlyTrackedBranches: false);
         }
 
         [Test]
diff --git a/src/GitVersionCore.Tests/IntegrationTests/MasterScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/MasterScenarios.cs
@@ -1,4 +1,4 @@
-﻿using GitTools.Testing;
+using GitTools.Testing;
 using LibGit2Sharp;
 using NUnit.Framework;
 using GitVersion.Configuration;
@@ -93,7 +93,7 @@ public void GivenARepositoryWithCommitsButNoTagsWithDetachedHeadVersionShouldBe0
             Commands.Checkout(fixture.Repository, commit);
 
             // When
-            fixture.AssertFullSemver("0.1.0+2");
+            fixture.AssertFullSemver("0.1.0+2", onlyTrackedBranches: false);
         }
 
         [Test]
@@ -207,4 +207,4 @@ public void AreTagsNotAdheringToTagPrefixIgnored()
             fixture.AssertFullSemver(config, "0.1.0+6");   //Fallback version + 6 commits since tag
         }
     }
-}
+}
diff --git a/src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs b/src/GitVersionCore.Tests/IntegrationTests/RemoteRepositoryScenarios.cs
@@ -68,7 +68,7 @@ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedheadUsingExistingImp
                 fixture.LocalRepositoryFixture.Repository,
                 fixture.LocalRepositoryFixture.Repository.Head.Tip);
 
-            Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository, isForTrackedBranchOnly: false),
+            Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository, onlyTrackedBranches: false),
                 $"It looks like the branch being examined is a detached Head pointing to commit '{fixture.LocalRepositoryFixture.Repository.Head.Tip.Id.ToString(7)}'. Without a proper branch name GitVersion cannot determine the build version.");
         }
 
diff --git a/src/GitVersionCore.Tests/VariableProviderTests.cs b/src/GitVersionCore.Tests/VariableProviderTests.cs
@@ -1,30 +1,55 @@
-using System;
-using NUnit.Framework;
-using Shouldly;
+using GitVersion;
+using GitVersion.Logging;
 using GitVersion.OutputFormatters;
 using GitVersion.OutputVariables;
-using GitVersion;
 using GitVersion.VersioningModes;
 using GitVersionCore.Tests.Helpers;
 using Microsoft.Extensions.DependencyInjection;
+using NUnit.Framework;
+using Shouldly;
+using System;
+using System.Collections.Generic;
 
 namespace GitVersionCore.Tests
 {
     [TestFixture]
     public class VariableProviderTests : TestBase
     {
         private IVariableProvider variableProvider;
+        private List<string> logMessages;
 
         [SetUp]
         public void Setup()
         {
             ShouldlyConfiguration.ShouldMatchApprovedDefaults.LocateTestMethodUsingAttribute<TestAttribute>();
 
-            var sp = ConfigureServices();
+            logMessages = new List<string>();
+
+            var sp = ConfigureServices(services =>
+            {
+                var log = new Log(new TestLogAppender(logMessages.Add));
+                services.AddSingleton<ILog>(log);
+            });
 
             variableProvider = sp.GetService<IVariableProvider>();
         }
 
+        [Test]
+        public void ShouldLogWarningWhenUsingDefaultInformationalVersionInCustomFormat()
+        {
+            var semVer = new SemanticVersion
+            {
+                Major = 1,
+                Minor = 2,
+                Patch = 3,
+            };
+
+            var propertyName = nameof(SemanticVersionFormatValues.DefaultInformationalVersion);
+            var config = new TestEffectiveConfiguration(assemblyInformationalFormat: $"{{{propertyName}}}");
+            variableProvider.GetVariablesFor(semVer, config, false);
+            logMessages.ShouldContain(message => message.Trim().StartsWith("WARN") && message.Contains(propertyName), 1, $"Expected a warning to be logged when using the variable {propertyName} in a configuration format template");
+        }
+
         [Test]
         [Category("NoMono")]
         [Description("Won't run on Mono due to source information not being available for ShouldMatchApproved.")]
diff --git a/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs b/src/GitVersionCore/Configuration/BranchConfigurationCalculator.cs
@@ -26,7 +26,7 @@ public BranchConfigurationCalculator(ILog log, GitVersionContext context)
         public BranchConfig GetBranchConfiguration(Branch targetBranch, IList<Branch> excludedInheritBranches = null)
         {
             var matchingBranches = context.FullConfiguration.GetConfigForBranch(targetBranch.NameWithoutRemote());
-            
+
             if (matchingBranches == null)
             {
                 log.Info($"No branch configuration found for branch {targetBranch.FriendlyName}, falling back to default configuration");
@@ -84,7 +84,7 @@ private BranchConfig InheritBranchConfiguration(Branch targetBranch, BranchConfi
                 List<Branch> possibleParents;
                 if (branchPoint == BranchCommit.Empty)
                 {
-                    possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate, true)
+                    possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate, false)
                         // It fails to inherit Increment branch configuration if more than 1 parent;
                         // therefore no point to get more than 2 parents
                         .Take(2)
@@ -93,11 +93,11 @@ private BranchConfig InheritBranchConfiguration(Branch targetBranch, BranchConfi
                 else
                 {
                     var branches = context.RepositoryMetadataProvider
-                        .GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate, true).ToList();
+                        .GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate, false).ToList();
                     if (branches.Count > 1)
                     {
                         var currentTipBranches = context.RepositoryMetadataProvider
-                            .GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, true).ToList();
+                            .GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, false).ToList();
                         possibleParents = branches.Except(currentTipBranches).ToList();
                     }
                     else
diff --git a/src/GitVersionCore/GitRepoMetadataProvider.cs b/src/GitVersionCore/GitRepoMetadataProvider.cs
@@ -81,7 +81,7 @@ public IEnumerable<Branch> GetBranchesContainingCommit(Commit commit, IList<Bran
                 // TODO: It looks wasteful looping through the branches twice. Can't these loops be merged somehow? @asbjornu
                 foreach (var branch in branches)
                 {
-                    if (branch.Tip != null && branch.Tip.Sha != commit.Sha || (onlyTrackedBranches && !branch.IsTracking))
+                    if (branch.Tip != null && branch.Tip.Sha != commit.Sha || ((onlyTrackedBranches && branch.IsTracking) || !onlyTrackedBranches))
                     {
                         continue;
                     }
@@ -97,7 +97,7 @@ public IEnumerable<Branch> GetBranchesContainingCommit(Commit commit, IList<Bran
                 }
 
                 log.Info($"No direct branches found, searching through {(onlyTrackedBranches ? "tracked" : "all")} branches.");
-                foreach (var branch in branches.Where(b => onlyTrackedBranches && !b.IsTracking))
+                foreach (var branch in branches.Where(b => (onlyTrackedBranches && b.IsTracking) || !onlyTrackedBranches))
                 {
                     log.Info($"Searching for commits reachable from '{branch.FriendlyName}'.");
 
diff --git a/src/GitVersionCore/GitVersionContext.cs b/src/GitVersionCore/GitVersionContext.cs
@@ -14,18 +14,18 @@ public class GitVersionContext
     {
         private readonly ILog log;
 
-        public GitVersionContext(IRepository repository, ILog log, string targetBranch, Config configuration, bool onlyEvaluateTrackedBranches = true, string commitId = null)
-             : this(repository, log, GetTargetBranch(repository, targetBranch), configuration, onlyEvaluateTrackedBranches, commitId)
+        public GitVersionContext(IRepository repository, ILog log, string targetBranch, Config configuration, bool onlyTrackedBranches = false, string commitId = null)
+             : this(repository, log, GetTargetBranch(repository, targetBranch), configuration, onlyTrackedBranches, commitId)
         {
         }
 
-        public GitVersionContext(IRepository repository, ILog log, Branch currentBranch, Config configuration, bool onlyEvaluateTrackedBranches = true, string commitId = null)
+        public GitVersionContext(IRepository repository, ILog log, Branch currentBranch, Config configuration, bool onlyTrackedBranches = false, string commitId = null)
         {
             this.log = log;
             Repository = repository;
             RepositoryMetadataProvider = new GitRepoMetadataProvider(repository, log, configuration);
             FullConfiguration = configuration;
-            OnlyEvaluateTrackedBranches = onlyEvaluateTrackedBranches;
+            OnlyTrackedBranches = onlyTrackedBranches;
 
             if (currentBranch == null)
                 throw new InvalidOperationException("Need a branch to operate on");
@@ -53,7 +53,7 @@ public GitVersionContext(IRepository repository, ILog log, Branch currentBranch,
 
             if (currentBranch.IsDetachedHead())
             {
-                CurrentBranch = RepositoryMetadataProvider.GetBranchesContainingCommit(CurrentCommit, repository.Branches.ToList(), OnlyEvaluateTrackedBranches).OnlyOrDefault() ?? currentBranch;
+                CurrentBranch = RepositoryMetadataProvider.GetBranchesContainingCommit(CurrentCommit, repository.Branches.ToList(), OnlyTrackedBranches).OnlyOrDefault() ?? currentBranch;
             }
             else
             {
@@ -78,7 +78,7 @@ public GitVersionContext(IRepository repository, ILog log, Branch currentBranch,
         /// </summary>
         public Config FullConfiguration { get; }
         public SemanticVersion CurrentCommitTaggedVersion { get; }
-        public bool OnlyEvaluateTrackedBranches { get; }
+        public bool OnlyTrackedBranches { get; }
         public EffectiveConfiguration Configuration { get; private set; }
         public IRepository Repository { get; }
         public Branch CurrentBranch { get; }
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
@@ -19,14 +19,13 @@
     <ItemGroup>
         <PackageReference Include="LibGit2Sharp" Version="$(PackageVersion_LibGit2Sharp)" />
         <PackageReference Include="JetBrains.Annotations" Version="$(PackageVersion_JetBrainsAnnotations)" PrivateAssets="All" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.0.1" />
-        <PackageReference Include="Microsoft.Extensions.Options" Version="3.0.1" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="3.1.1" />
+        <PackageReference Include="Microsoft.Extensions.Options" Version="3.1.1" />
         <PackageReference Include="YamlDotNet" Version="$(PackageVersion_YamlDotNet)" />
     </ItemGroup>
 
     <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
         <PackageReference Include="System.Net.Requests" Version="4.3.0" />
-        <PackageReference Include="System.Reflection.TypeExtensions" Version="4.6.0" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/GitVersionCore/OutputVariables/VariableProvider.cs b/src/GitVersionCore/OutputVariables/VariableProvider.cs
diff --git a/src/GitVersionCore/OutputVariables/VersionVariables.cs b/src/GitVersionCore/OutputVariables/VersionVariables.cs
diff --git a/src/GitVersionCore/SemanticVersioning/SemanticVersionFormatValues.cs b/src/GitVersionCore/SemanticVersioning/SemanticVersionFormatValues.cs
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
diff --git a/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj b/src/GitVersionTask.MsBuild/GitVersionTask.MsBuild.csproj
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public static class GitToolsTestingExtensions`
`19`	`19`
`20`	`20`	`static GitToolsTestingExtensions() => sp = ConfigureService();`
`21`	`21`
`22`		`- public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true, string targetBranch = null)`
	`22`	`+ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Config configuration = null, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)`
`23`	`23`	`{`
`24`	`24`	`if (configuration == null)`
`25`	`25`	`{`
`@@ -31,7 +31,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co`
`31`	`31`	`var variableProvider = sp.GetService<IVariableProvider>();`
`32`	`32`	`var versionFinder = sp.GetService<IGitVersionFinder>();`
`33`	`33`
`34`		`- var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, isForTrackedBranchOnly, commitId);`
	`34`	`+ var gitVersionContext = new GitVersionContext(repository ?? fixture.Repository, log, targetBranch, configuration, onlyTrackedBranches, commitId);`
`35`	`35`	`var executeGitVersion = versionFinder.FindVersion(gitVersionContext);`
`36`	`36`	`var variables = variableProvider.GetVariablesFor(executeGitVersion, gitVersionContext.Configuration, gitVersionContext.IsCurrentCommitTagged);`
`37`	`37`
`@@ -47,19 +47,19 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co`
`47`	`47`	`}`
`48`	`48`	`}`
`49`	`49`
`50`		`- public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true, string targetBranch = null)`
	`50`	`+ public static void AssertFullSemver(this RepositoryFixtureBase fixture, string fullSemver, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)`
`51`	`51`	`{`
`52`		`- fixture.AssertFullSemver(new Config(), fullSemver, repository, commitId, isForTrackedBranchOnly, targetBranch);`
	`52`	`+ fixture.AssertFullSemver(new Config(), fullSemver, repository, commitId, onlyTrackedBranches, targetBranch);`
`53`	`53`	`}`
`54`	`54`
`55`		`- public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config configuration, string fullSemver, IRepository repository = null, string commitId = null, bool isForTrackedBranchOnly = true, string targetBranch = null)`
	`55`	`+ public static void AssertFullSemver(this RepositoryFixtureBase fixture, Config configuration, string fullSemver, IRepository repository = null, string commitId = null, bool onlyTrackedBranches = true, string targetBranch = null)`
`56`	`56`	`{`
`57`	`57`	`configuration.Reset();`
`58`	`58`	`Console.WriteLine("---------");`
`59`	`59`
`60`	`60`	`try`
`61`	`61`	`{`
`62`		`- var variables = fixture.GetVersion(configuration, repository, commitId, isForTrackedBranchOnly, targetBranch);`
	`62`	`+ var variables = fixture.GetVersion(configuration, repository, commitId, onlyTrackedBranches, targetBranch);`
`63`	`63`	`variables.FullSemVer.ShouldBe(fullSemver);`
`64`	`64`	`}`
`65`	`65`	`catch (Exception)`
Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ public void WhenDevelopBranchedFromMasterDetachedHeadMinorIsIncreased()`
`143`	`143`	`var commit = fixture.Repository.Head.Tip;`
`144`	`144`	`fixture.Repository.MakeACommit();`
`145`	`145`	`Commands.Checkout(fixture.Repository, commit);`
`146`		`- fixture.AssertFullSemver("1.1.0-alpha.1");`
	`146`	`+ fixture.AssertFullSemver("1.1.0-alpha.1", onlyTrackedBranches: false);`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using GitTools.Testing;`
	`1`	`+using GitTools.Testing;`
`2`	`2`	`using LibGit2Sharp;`
`3`	`3`	`using NUnit.Framework;`
`4`	`4`	`using GitVersion.Configuration;`
`@@ -93,7 +93,7 @@ public void GivenARepositoryWithCommitsButNoTagsWithDetachedHeadVersionShouldBe0`
`93`	`93`	`Commands.Checkout(fixture.Repository, commit);`
`94`	`94`
`95`	`95`	`// When`
`96`		`- fixture.AssertFullSemver("0.1.0+2");`
	`96`	`+ fixture.AssertFullSemver("0.1.0+2", onlyTrackedBranches: false);`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`[Test]`
`@@ -207,4 +207,4 @@ public void AreTagsNotAdheringToTagPrefixIgnored()`
`207`	`207`	`fixture.AssertFullSemver(config, "0.1.0+6"); //Fallback version + 6 commits since tag`
`208`	`208`	`}`
`209`	`209`	`}`
`210`		`-}`
	`210`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public void GivenARemoteGitRepositoryWhenCheckingOutDetachedheadUsingExistingImp`
`68`	`68`	`fixture.LocalRepositoryFixture.Repository,`
`69`	`69`	`fixture.LocalRepositoryFixture.Repository.Head.Tip);`
`70`	`70`
`71`		`- Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository, isForTrackedBranchOnly: false),`
	`71`	`+ Should.Throw<WarningException>(() => fixture.AssertFullSemver("0.1.0+4", fixture.LocalRepositoryFixture.Repository, onlyTrackedBranches: false),`
`72`	`72`	`$"It looks like the branch being examined is a detached Head pointing to commit '{fixture.LocalRepositoryFixture.Repository.Head.Tip.Id.ToString(7)}'. Without a proper branch name GitVersion cannot determine the build version.");`
`73`	`73`	`}`
`74`	`74`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public BranchConfigurationCalculator(ILog log, GitVersionContext context)`
`26`	`26`	`public BranchConfig GetBranchConfiguration(Branch targetBranch, IList<Branch> excludedInheritBranches = null)`
`27`	`27`	`{`
`28`	`28`	`var matchingBranches = context.FullConfiguration.GetConfigForBranch(targetBranch.NameWithoutRemote());`
`29`		`-`
	`29`	`+`
`30`	`30`	`if (matchingBranches == null)`
`31`	`31`	`{`
`32`	`32`	`log.Info($"No branch configuration found for branch {targetBranch.FriendlyName}, falling back to default configuration");`
`@@ -84,7 +84,7 @@ private BranchConfig InheritBranchConfiguration(Branch targetBranch, BranchConfi`
`84`	`84`	`List<Branch> possibleParents;`
`85`	`85`	`if (branchPoint == BranchCommit.Empty)`
`86`	`86`	`{`
`87`		`- possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate, true)`
	`87`	`+ possibleParents = context.RepositoryMetadataProvider.GetBranchesContainingCommit(targetBranch.Tip, branchesToEvaluate, false)`
`88`	`88`	`// It fails to inherit Increment branch configuration if more than 1 parent;`
`89`	`89`	`// therefore no point to get more than 2 parents`
`90`	`90`	`.Take(2)`
`@@ -93,11 +93,11 @@ private BranchConfig InheritBranchConfiguration(Branch targetBranch, BranchConfi`
`93`	`93`	`else`
`94`	`94`	`{`
`95`	`95`	`var branches = context.RepositoryMetadataProvider`
`96`		`- .GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate, true).ToList();`
	`96`	`+ .GetBranchesContainingCommit(branchPoint.Commit, branchesToEvaluate, false).ToList();`
`97`	`97`	`if (branches.Count > 1)`
`98`	`98`	`{`
`99`	`99`	`var currentTipBranches = context.RepositoryMetadataProvider`
`100`		`- .GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, true).ToList();`
	`100`	`+ .GetBranchesContainingCommit(context.CurrentCommit, branchesToEvaluate, false).ToList();`
`101`	`101`	`possibleParents = branches.Except(currentTipBranches).ToList();`
`102`	`102`	`}`
`103`	`103`	`else`
Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ public IEnumerable<Branch> GetBranchesContainingCommit(Commit commit, IList<Bran`
`81`	`81`	`// TODO: It looks wasteful looping through the branches twice. Can't these loops be merged somehow? @asbjornu`
`82`	`82`	`foreach (var branch in branches)`
`83`	`83`	`{`
`84`		`- if (branch.Tip != null && branch.Tip.Sha != commit.Sha \|\| (onlyTrackedBranches && !branch.IsTracking))`
	`84`	`+ if (branch.Tip != null && branch.Tip.Sha != commit.Sha \|\| ((onlyTrackedBranches && branch.IsTracking) \|\| !onlyTrackedBranches))`
`85`	`85`	`{`
`86`	`86`	`continue;`
`87`	`87`	`}`
`@@ -97,7 +97,7 @@ public IEnumerable<Branch> GetBranchesContainingCommit(Commit commit, IList<Bran`
`97`	`97`	`}`
`98`	`98`
`99`	`99`	`log.Info($"No direct branches found, searching through {(onlyTrackedBranches ? "tracked" : "all")} branches.");`
`100`		`- foreach (var branch in branches.Where(b => onlyTrackedBranches && !b.IsTracking))`
	`100`	`+ foreach (var branch in branches.Where(b => (onlyTrackedBranches && b.IsTracking) \|\| !onlyTrackedBranches))`
`101`	`101`	`{`
`102`	`102`	`log.Info($"Searching for commits reachable from '{branch.FriendlyName}'.");`
`103`	`103`