Skip to content

Commit 286ec69

Browse files
committed
Remove a merge message false positive test
This example is super hard to support, the way we supported it was by hard coding branch prefixes. Instead scenarios like this should use the ignore-sha feature to remove the merge message from version calculations.
1 parent e5f1c1d commit 286ec69

File tree

1 file changed

+0
-2
lines changed

1 file changed

+0
-2
lines changed

src/GitVersionCore.Tests/VersionCalculation/Strategies/MergeMessageBaseVersionStrategyTests.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,14 +82,12 @@ Another commit message
8282
Commit message including a IP-number https://10.50.1.1
8383
A commit message")]
8484
[TestCase(@"Merge branch 'release/Sprint_2.0_Holdings_Computed_Balances'")]
85-
[TestCase(@"Merge branch 'feature/fix-for-08.14-push'")]
8685
[TestCase(@"Merge branch 'develop' of http://10.0.6.3/gitblit/r/... into develop")]
8786
[TestCase(@"Merge branch 'master' of http://172.16.3.10:8082/r/asu_tk/p_sd")]
8887
[TestCase(@"Merge branch 'master' of http://212.248.89.56:8082/r/asu_tk/p_sd")]
8988
[TestCase(@"Merge branch 'DEMO' of http://10.10.10.121/gitlab/mtolland/orcid into DEMO")]
9089
public void MergeMessagesThatIsNotRelatedToGitVersion(string commitMessage)
9190
{
92-
9391
var parents = GetParents(true);
9492

9593
AssertMergeMessage(commitMessage, null, parents);

0 commit comments

Comments
 (0)