Skip to content

Fixes #375 - Made known merge branch version number extraction case insensitive #377

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
Mar 9, 2015
Merged

Fixes #375 - Made known merge branch version number extraction case insensitive #377

Show file tree
Hide file tree
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
4 changes: 4 additions & 0 deletions GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ public void ShouldNotAllowIncrementOfVersion()
[TestCase("Merge branch 'release-10.10.50'", true, "10.10.50")]
[TestCase("Merge branch 's'", true, null)] // Must start with a number
[TestCase("Merge branch 'release-0.2.0'", true, "0.2.0")]
[TestCase("Merge branch 'Release-0.2.0'", true, "0.2.0")]
[TestCase("Merge branch 'Release/0.2.0'", true, "0.2.0")]
[TestCase("Merge branch 'hotfix-4.6.6' into support-4.6", true, "4.6.6")]
[TestCase("Merge branch 'hotfix-10.10.50'", true, "10.10.50")]
[TestCase("Merge branch 'Hotfix-10.10.50'", true, "10.10.50")]
[TestCase("Merge branch 'Hotfix/10.10.50'", true, "10.10.50")]
[TestCase("Merge branch 'hotfix-0.1.5'", true, "0.1.5")]
[TestCase("Merge branch 'hotfix-4.2.2' into support-4.2", true, "4.2.2")]
[TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
Expand Down
30 changes: 8 additions & 22 deletions GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,31 +50,17 @@ static bool Inner(Commit mergeCommit, out string versionPart)

var message = mergeCommit.Message.TrimToFirstLine();

var knownMergePrefixes = new[] { "Merge branch 'hotfix-", "Merge branch 'hotfix/", "Merge branch 'release-", "Merge branch 'release/" };

if (message.StartsWith("Merge branch 'hotfix-"))
foreach (var prefix in knownMergePrefixes)
{
var suffix = message.Replace("Merge branch 'hotfix-", "");
return TryGetPrefix(suffix, out versionPart, "'");
}

if (message.StartsWith("Merge branch 'hotfix/"))
{
var suffix = message.Replace("Merge branch 'hotfix/", "");
return TryGetPrefix(suffix, out versionPart, "'");
}

if (message.StartsWith("Merge branch 'release-"))
{
var suffix = message.Replace("Merge branch 'release-", "");
return TryGetPrefix(suffix, out versionPart, "'");
}

if (message.StartsWith("Merge branch 'release/"))
{
var suffix = message.Replace("Merge branch 'release/", "");
return TryGetPrefix(suffix, out versionPart, "'");
if (message.StartsWith(prefix))
{
var suffix = message.Substring(prefix.Length);
return TryGetPrefix(suffix, out versionPart, "'");
}
}

if (message.StartsWith("Merge branch '"))
{
var suffix = message.Replace("Merge branch '", "");
Expand Down