diff --git a/GitVersionCore/BuildServers/GitHelper.cs b/GitVersionCore/BuildServers/GitHelper.cs index aa083b9544..a2b040da18 100644 --- a/GitVersionCore/BuildServers/GitHelper.cs +++ b/GitVersionCore/BuildServers/GitHelper.cs @@ -7,7 +7,7 @@ namespace GitVersion public static class GitHelper { - const string MergeMessageRegexPattern = "refs/heads/(pr|pull(-requests)?/(?[0-9]*)/merge)"; + const string MergeMessageRegexPattern = "refs/heads/(pr|pull(-requests)?/(?[0-9]*)/(merge|head))"; public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication) { @@ -76,6 +76,7 @@ public static string ExtractIssueNumber(string mergeMessage) // Dynamic: refs/heads/pr/5 // Github Message: refs/heads/pull/5/merge // Stash Message: refs/heads/pull-requests/5/merge + // refs/heads/pull/5/head var regex = new Regex(MergeMessageRegexPattern); var match = regex.Match(mergeMessage); diff --git a/GitVersionExe.Tests/PullRequestInTeamCityTest.cs b/GitVersionExe.Tests/PullRequestInTeamCityTest.cs index d056a7eea4..66d5ad1bc2 100644 --- a/GitVersionExe.Tests/PullRequestInTeamCityTest.cs +++ b/GitVersionExe.Tests/PullRequestInTeamCityTest.cs @@ -10,6 +10,7 @@ public class PullRequestInTeamCityTest [TestCase("refs/pull-requests/5/merge")] [TestCase("refs/pull/5/merge")] + [TestCase("refs/heads/pull/5/head")] public void GivenARemoteWithATagOnMaster_AndAPullRequestWithTwoCommits_AndBuildIsRunningInTeamCity_VersionIsCalculatedProperly(string pullRequestRef) { using (var fixture = new EmptyRepositoryFixture(new Config()))