Skip to content

Commit 0ee69e9

Browse files
author
Johannes Egger
committed
Simplify the merge version parsing code
1 parent c96b55b commit 0ee69e9

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

GitVersionCore/VersionCalculation/BaseVersionCalculators/MergeMessageBaseVersionStrategy.cs

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -31,35 +31,26 @@ public override BaseVersion GetVersion(GitVersionContext context)
3131

3232
static bool TryParse(Commit mergeCommit, EffectiveConfiguration configuration, out SemanticVersion semanticVersion)
3333
{
34-
string versionPart;
35-
if (Inner(mergeCommit, out versionPart))
36-
{
37-
return SemanticVersion.TryParse(versionPart, configuration.GitTagPrefix, out semanticVersion);
38-
}
39-
semanticVersion = null;
40-
return false;
34+
semanticVersion = Inner(mergeCommit, configuration);
35+
return semanticVersion != null;
4136
}
4237

43-
static bool Inner(Commit mergeCommit, out string versionPart)
38+
private static SemanticVersion Inner(Commit mergeCommit, EffectiveConfiguration configuration)
4439
{
4540
if (mergeCommit.Parents.Count() < 2)
4641
{
47-
versionPart = null;
48-
return false;
42+
return null;
4943
}
5044

51-
var version = mergeCommit
45+
return mergeCommit
5246
.Message.Split('/', '-', '\'', '"', ' ')
5347
.Select(part =>
5448
{
5549
SemanticVersion v;
56-
return SemanticVersion.TryParse(part, "", out v) ? v : null;
50+
return SemanticVersion.TryParse(part, configuration.GitTagPrefix, out v) ? v : null;
5751
}).FirstOrDefault(v => v != null)
5852
;
5953

60-
versionPart = version!=null ? version.ToString() : null;
61-
62-
return versionPart != null;
6354
}
6455

6556
static bool TryGetPrefix(string target, out string result, string splitter)

0 commit comments

Comments
 (0)