Skip to content

Commit 9e30c40

Browse files
committed
Fixed #659 by adjusting the regexp
- Added negative lookbehind to filter out version string prefixed with '://' like 'file|http[s]://' etc.
1 parent 58dc799 commit 9e30c40

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ private static SemanticVersion Inner(Commit mergeCommit, EffectiveConfiguration
4242
}
4343

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

0 commit comments

Comments
 (0)