Skip to content

Commit 8dcc088

Browse files
authored
Merge pull request #2376 from chrisism/hotfix/merge_message_format_issue
Added simple fix for mergemessageformats override
2 parents bc45605 + 2fd3c68 commit 8dcc088

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/GitVersionCore/Configuration/ConfigurationBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ private static void ApplyOverrides([NotNull] Config targetConfig, [NotNull] Conf
6060
targetConfig.CommitMessageIncrementing = overrideConfig.CommitMessageIncrementing ?? targetConfig.CommitMessageIncrementing;
6161
targetConfig.Increment = overrideConfig.Increment ?? targetConfig.Increment;
6262
targetConfig.CommitDateFormat = overrideConfig.CommitDateFormat ?? targetConfig.CommitDateFormat;
63-
targetConfig.MergeMessageFormats = overrideConfig.MergeMessageFormats ?? targetConfig.MergeMessageFormats;
63+
targetConfig.MergeMessageFormats = overrideConfig.MergeMessageFormats.Any() ? overrideConfig.MergeMessageFormats : targetConfig.MergeMessageFormats;
6464
targetConfig.UpdateBuildNumber = overrideConfig.UpdateBuildNumber ?? targetConfig.UpdateBuildNumber;
6565

6666
if (overrideConfig.Ignore != null && !overrideConfig.Ignore.IsEmpty)

0 commit comments

Comments
 (0)