Skip to content

Fixes #380 - "Merge tag '1.1.0' into support/1.0" is not recognized as merge commit #381

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

Closed
johannesegger wants to merge 1 commit into from
Closed

Fixes #380 - "Merge tag '1.1.0' into support/1.0" is not recognized as merge commit #381

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
11 changes: 11 additions & 0 deletions GitVersionCore/MergeMessageParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,17 @@ static bool Inner(Commit mergeCommit, out string versionPart)
return suffix.TryGetPrefix(out versionPart, "'");
}

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

if (suffix.Contains("-"))
{
suffix = suffix.Split('-')[1];
}
return suffix.TryGetPrefix(out versionPart, "'");
}

if (message.StartsWith("Merge pull request #"))
{
var split = message.Split(new[]
Expand Down
1 change: 1 addition & 0 deletions GitVersionTask.Tests/MergeMessageParserTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ public class MergeMessageParserTests
[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 tag '10.10.50'", true, "10.10.50")]
[TestCase("Merge branch 'hotfix-0.1.5'", true, "0.1.5")]
[TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]
[TestCase("Merge branch 'alpha-0.1.5'", true, "0.1.5")]
Expand Down