Skip to content

Alternative refspecs #361

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
JakeGinnivan merged 2 commits into from
Feb 6, 2015
Merged

Alternative refspecs #361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a432bf
failing test
thefringeninja Feb 5, 2015
dd528b0
changed the regex to allow +:refs/heads/*
thefringeninja Feb 5, 2015
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
3 changes: 2 additions & 1 deletion GitVersionCore/BuildServers/GitHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ namespace GitVersion

public static class GitHelper
{
const string MergeMessageRegexPattern = "refs/heads/(pr|pull(-requests)?/(?<issuenumber>[0-9]*)/merge)";
const string MergeMessageRegexPattern = "refs/heads/(pr|pull(-requests)?/(?<issuenumber>[0-9]*)/(merge|head))";

public static void NormalizeGitDirectory(string gitDirectory, Authentication authentication)
{
Expand Down Expand Up @@ -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);

Expand Down
1 change: 1 addition & 0 deletions GitVersionExe.Tests/PullRequestInTeamCityTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()))
Expand Down