Skip to content

Commit e91df74

Browse files
committed
Invert mergeMessage creation
1 parent 104a942 commit e91df74

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

src/GitVersion.Core/MergeMessage.cs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,14 +97,15 @@ public static bool TryParse(
9797
mergeCommit.NotNull();
9898
configuration.NotNull();
9999

100-
mergeMessage = new(mergeCommit.Message, configuration);
100+
mergeMessage = null;
101101

102-
var isReleaseBranch = mergeMessage.MergedBranch != null && configuration.IsReleaseBranch(mergeMessage.MergedBranch);
102+
var mergedBranch = new MergeMessage(mergeCommit.Message, configuration).MergedBranch;
103+
var isReleaseBranch = mergedBranch != null && configuration.IsReleaseBranch(mergedBranch);
103104
var isValidMergeCommit = mergeCommit.IsMergeCommit() || isReleaseBranch;
104105

105-
if (!isValidMergeCommit)
106+
if (isValidMergeCommit)
106107
{
107-
mergeMessage = null;
108+
mergeMessage = new(mergeCommit.Message, configuration);
108109
}
109110

110111
return isValidMergeCommit;

0 commit comments

Comments
 (0)