Skip to content

Commit 8cf9add

Browse files
maxraabJakeGinnivan
authored andcommitted
Mark default branch config with isDevelop
1 parent 8e6cbee commit 8cf9add

File tree

2 files changed

+5
-7
lines changed

2 files changed

+5
-7
lines changed

src/GitVersionCore.Tests/IntegrationTests/FeatureBranchScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -255,7 +255,7 @@ public void PickUpVersionFromMasterMarkedWithIsDevelop()
255255
}
256256
},
257257
{
258-
"releases?[/-]", new BranchConfig()
258+
"release", new BranchConfig()
259259
{
260260
Tag = "rc",
261261
}

src/GitVersionCore/BranchConfigurationCalculator.cs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,12 @@
11
namespace GitVersion
22
{
3+
using JetBrains.Annotations;
4+
using LibGit2Sharp;
35
using System;
46
using System.Collections.Generic;
57
using System.Linq;
68
using System.Text.RegularExpressions;
79

8-
using JetBrains.Annotations;
9-
10-
using LibGit2Sharp;
11-
1210
public class BranchConfigurationCalculator
1311
{
1412
public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit currentCommit, IRepository repository, bool onlyEvaluateTrackedBranches, Config config, Branch currentBranch, IList<Branch> excludedInheritBranches = null)
@@ -22,7 +20,7 @@ public static KeyValuePair<string, BranchConfig> GetBranchConfiguration(Commit c
2220
currentBranch.FriendlyName));
2321

2422
var branchConfig = new BranchConfig();
25-
ConfigurationProvider.ApplyBranchDefaults(config, branchConfig, "");
23+
ConfigurationProvider.ApplyBranchDefaults(config, branchConfig, "", isDevelop: true);
2624
return new KeyValuePair<string, BranchConfig>(string.Empty, branchConfig);
2725
}
2826
if (matchingBranches.Length == 1)
@@ -48,7 +46,7 @@ static KeyValuePair<string, BranchConfig>[] LookupBranchConfiguration([NotNull]
4846
{
4947
throw new ArgumentNullException("config");
5048
}
51-
49+
5250
if (currentBranch == null)
5351
{
5452
throw new ArgumentNullException("currentBranch");

0 commit comments

Comments
 (0)