Skip to content

Feature/659 fix ip should not be matched as versions #661

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 5 commits into from
Oct 4, 2015
Merged

Feature/659 fix ip should not be matched as versions #661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9d0b6bf
updated ncrunch includes to match libgit dependency
mkoertgen Oct 4, 2015
58dc799
Added failing test for #659
mkoertgen Oct 4, 2015
9e30c40
Fixed #659 by adjusting the regexp
mkoertgen Oct 4, 2015
b53c706
Added test cases for similar issues #557
mkoertgen Oct 4, 2015
78b9837
Added testcase for https://github.com/GitTools/GitVersion/issues/557#…
mkoertgen Oct 4, 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
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/GitVersionCore.Tests.v2.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
<MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
<BuildProcessArchitecture>x86</BuildProcessArchitecture>
<AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\**.*;Resources\**.*</AdditionalFilesToInclude>
<AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.21.0.176\lib\net40\NativeBinaries\**.*;Resources\**.*</AdditionalFilesToInclude>
<HiddenWarnings>PostBuildEventDisabled;CopyReferencedAssembliesToWorkspaceIsOn</HiddenWarnings>
</ProjectConfiguration>
4 changes: 4 additions & 0 deletions ...itVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,10 @@ Another commit message
A commit message")]
[TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
[TestCase(@"Merge branch 'feature/fix-for-08.14-push'")]
[TestCase(@"Merge branch 'develop' of http://10.0.6.3/gitblit/r/... into develop")]
[TestCase(@"Merge branch 'master' of http://172.16.3.10:8082/r/asu_tk/p_sd")]
[TestCase(@"Merge branch 'master' of http://212.248.89.56:8082/r/asu_tk/p_sd")]
[TestCase(@"Merge branch 'DEMO' of http://10.10.10.121/gitlab/mtolland/orcid into DEMO")]
public void MergeMessagesThatIsNotRelatedToGitVersion(string commitMessage)
{

Expand Down
2 changes: 1 addition & 1 deletion ...tVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ private static SemanticVersion Inner(Commit mergeCommit, EffectiveConfiguration
}

//TODO: Make the version prefixes customizable
var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(([rR]elease|[hH]otfix|[aA]lpha)-|-v|/|/v|'|Finish )(?<PossibleVersions>\d+\.\d+(\.*\d+)*)")
var possibleVersions = Regex.Matches(mergeCommit.Message, @"^.*?(([rR]elease|[hH]otfix|[aA]lpha)-|-v|/|/v|'|Finish )(?<PossibleVersions>(?<!://)\d+\.\d+(\.*\d+)*)")
.Cast<Match>()
.Select(m => m.Groups["PossibleVersions"].Value);

Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe.Tests/GitVersionExe.Tests.v2.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,6 @@
<UseCPUArchitecture>AutoDetect</UseCPUArchitecture>
<MSTestThreadApartmentState>STA</MSTestThreadApartmentState>
<BuildProcessArchitecture>x86</BuildProcessArchitecture>
<AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\**.*</AdditionalFilesToInclude>
<AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.21.0.176\lib\net40\NativeBinaries\**.*</AdditionalFilesToInclude>
<HiddenWarnings>CopyReferencedAssembliesToWorkspaceIsOn</HiddenWarnings>
</ProjectConfiguration>
2 changes: 1 addition & 1 deletion src/GitVersionTask.Tests/GitVersionTask.Tests.v2.ncrunchproject
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@
<FixtureName>IntegrationTests</FixtureName>
</FixtureTestSelector>
</IgnoredTests>
<AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.19.0.0\lib\net40\NativeBinaries\**.*</AdditionalFilesToInclude>
<AdditionalFilesToInclude>..\Packages\LibGit2Sharp.0.21.0.176\lib\net40\NativeBinaries\**.*</AdditionalFilesToInclude>
<HiddenWarnings>PostBuildEventDisabled;CopyReferencedAssembliesToWorkspaceIsOn</HiddenWarnings>
</ProjectConfiguration>