Merge pull request #174 from JakeGinnivan/FixIncorrectVersionBump

andreasohlund · andreasohlund · commit 1a6e10f401f1 · 2014-05-17T13:48:00.000+02:00
Fixed regression
diff --git a/GitVersionCore/MergeMessageParser.cs b/GitVersionCore/MergeMessageParser.cs
@@ -39,7 +39,7 @@ public static bool TryParse(Commit mergeCommit, out string versionPart)
                 var branch = Regex.Match(message, "from (?<branch>.*)").Groups["branch"].Value;
                 var lastBranchPart = branch.Split('/', '-').Last();
 
-                if (!char.IsNumber(lastBranchPart.First()))
+                if (!char.IsNumber(lastBranchPart.First()) || !lastBranchPart.Contains("."))
                 {
                     return false;
                 }
diff --git a/Tests/MergeMessageParserTests.cs b/Tests/MergeMessageParserTests.cs
@@ -19,6 +19,7 @@ public class MergeMessageParserTests
     [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")]
     [TestCase("Merge pull request #165 from Particular/release-1.0.0", true, "1.0.0")]
+    [TestCase("Merge pull request #95 from Particular/issue-94", false, null)]
     public void AssertMergeMessage(string message, bool isMergeCommit, string expectedVersion)
     {
         var c = new MockCommit

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ public static bool TryParse(Commit mergeCommit, out string versionPart)`
`39`	`39`	`var branch = Regex.Match(message, "from (?<branch>.*)").Groups["branch"].Value;`
`40`	`40`	`var lastBranchPart = branch.Split('/', '-').Last();`
`41`	`41`
`42`		`- if (!char.IsNumber(lastBranchPart.First()))`
	`42`	`+ if (!char.IsNumber(lastBranchPart.First()) \|\| !lastBranchPart.Contains("."))`
`43`	`43`	`{`
`44`	`44`	`return false;`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ public class MergeMessageParserTests`
`19`	`19`	`[TestCase("Merge branch 'hotfix-0.1.5'\n\nRelates to: TicketId", true, "0.1.5")]`
`20`	`20`	`[TestCase("Merge branch 'alpha-0.1.5'", true, "0.1.5")]`
`21`	`21`	`[TestCase("Merge pull request #165 from Particular/release-1.0.0", true, "1.0.0")]`
	`22`	`+ [TestCase("Merge pull request #95 from Particular/issue-94", false, null)]`
`22`	`23`	`public void AssertMergeMessage(string message, bool isMergeCommit, string expectedVersion)`
`23`	`24`	`{`
`24`	`25`	`var c = new MockCommit`