Skip to content

Added another feature branch mapping #741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2016
Merged

Added another feature branch mapping #741

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/GitVersionCore/Configuration/ConfigurationProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public static void ApplyDefaultsTo(Config config)
defaultIncrementStrategy: IncrementStrategy.Inherit);
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "hotfix(es)?[/-]"), defaultTag: "beta");
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "support[/-]"), defaultTag: string.Empty, defaultPreventIncrement: true);
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "dev(elop)?(ment)?$"),
ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "dev(elop)?(ment)?$"),
defaultTag: "unstable",
defaultIncrementStrategy: IncrementStrategy.Minor,
defaultVersioningMode: VersioningMode.ContinuousDeployment,
Expand All @@ -66,10 +66,10 @@ static void MigrateBranches(Config config)
// Map of current names and previous names
var dict = new Dictionary<string, string[]>
{
{ "hotfix(es)?[/-]", new []{"hotfix[/-]"}},
{ "features?[/-]", new []{"feature[/-]"}},
{ "releases?[/-]", new []{"release[/-]"}},
{ "dev(elop)?(ment)?$", new []{"develop"}}
{ "hotfix(es)?[/-]", new [] { "hotfix[/-]" }},
{ "features?[/-]", new [] { "feature[/-]", "feature(s)?[/-]" }},
{ "releases?[/-]", new [] { "release[/-]" }},
{ "dev(elop)?(ment)?$", new [] { "develop" }}
};

foreach (var mapping in dict)
Expand Down Expand Up @@ -101,7 +101,7 @@ static BranchConfig GetOrCreateBranchDefaults(Config config, string branch)
}

public static void ApplyBranchDefaults(Config config,
BranchConfig branchConfig,
BranchConfig branchConfig,
string defaultTag = "useBranchName",
IncrementStrategy defaultIncrementStrategy = IncrementStrategy.Patch,
bool defaultPreventIncrement = false,
Expand Down