Move commit-message-incrementing into global config, overridable in branch config.

Author: TomGillen

src/GitVersionCore.Tests/ConfigProviderTests.CanWriteOutEffectiveConfiguration.approved.txt

@@ -5,54 +5,48 @@ continuous-delivery-fallback-tag: ci
 major-version-bump-message: '\+semver:\s?(breaking|major)'
 minor-version-bump-message: '\+semver:\s?(feature|minor)'
 patch-version-bump-message: '\+semver:\s?(fix|patch)'
+commit-message-incrementing: Enabled
 branches:
   master:
     mode: ContinuousDelivery
     tag: 
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    commit-message-incrementing: Enabled
   release[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    commit-message-incrementing: Enabled
   feature[/-]:
     mode: ContinuousDelivery
     tag: useBranchName
     increment: Inherit
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
-    commit-message-incrementing: Enabled
   (pull|pull\-requests|pr)[/-]:
     mode: ContinuousDelivery
     tag: PullRequest
     increment: Inherit
     prevent-increment-of-merged-branch-version: false
     tag-number-pattern: '[/-](?<number>\d+)[-/]'
     track-merge-target: false
-    commit-message-incrementing: Enabled
   hotfix[/-]:
     mode: ContinuousDelivery
     tag: beta
     increment: Patch
     prevent-increment-of-merged-branch-version: false
     track-merge-target: false
-    commit-message-incrementing: Enabled
   support[/-]:
     mode: ContinuousDelivery
     tag: 
     increment: Patch
     prevent-increment-of-merged-branch-version: true
     track-merge-target: false
-    commit-message-incrementing: Enabled
   develop:
     mode: ContinuousDeployment
     tag: unstable
     increment: Minor
     prevent-increment-of-merged-branch-version: false
     track-merge-target: true
-    commit-message-incrementing: Enabled

src/GitVersionCore/Configuration/Config.cs

@@ -32,6 +32,9 @@ public class Config
         [YamlMember(Alias = "patch-version-bump-message")]
         public string PatchVersionBumpMessage { get; set; }
 
+        [YamlMember(Alias = "commit-message-incrementing")]
+        public CommitMessageIncrementMode? CommitMessageIncrementing { get; set; }
+
         [YamlMember(Alias = "branches")]
         public Dictionary<string, BranchConfig> Branches
         {

src/GitVersionCore/Configuration/ConfigurationProvider.cs

@@ -27,6 +27,7 @@ public static void ApplyDefaultsTo(Config config)
             config.MajorVersionBumpMessage = config.MajorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMajorPattern;
             config.MinorVersionBumpMessage = config.MinorVersionBumpMessage ?? IncrementStrategyFinder.DefaultMinorPattern;
             config.PatchVersionBumpMessage = config.PatchVersionBumpMessage ?? IncrementStrategyFinder.DefaultPatchPattern;
+            config.CommitMessageIncrementing = config.CommitMessageIncrementing ?? CommitMessageIncrementMode.Enabled;
             var configBranches = config.Branches.ToList();
 
             ApplyBranchDefaults(config, GetOrCreateBranchDefaults(config, "master"), defaultTag: string.Empty, defaultPreventIncrement: true);
@@ -71,19 +72,14 @@ public static void ApplyBranchDefaults(Config config,
             bool defaultPreventIncrement = false,
             VersioningMode? defaultVersioningMode = null, // Looked up from main config
             bool defaultTrackMergeTarget = false,
-            string defaultTagNumberPattern = null,
-            string majorVersionBumpMessage = IncrementStrategyFinder.DefaultMajorPattern,
-            string minorVersionBumpMessage = IncrementStrategyFinder.DefaultMinorPattern,
-            string patchVersionBumpMessage = IncrementStrategyFinder.DefaultPatchPattern,
-            CommitMessageIncrementMode commitMessageVersionBump = CommitMessageIncrementMode.Enabled)
+            string defaultTagNumberPattern = null)
         {
             branchConfig.Tag = branchConfig.Tag ?? defaultTag;
             branchConfig.TagNumberPattern = branchConfig.TagNumberPattern ?? defaultTagNumberPattern;
             branchConfig.Increment = branchConfig.Increment ?? defaultIncrementStrategy;
             branchConfig.PreventIncrementOfMergedBranchVersion = branchConfig.PreventIncrementOfMergedBranchVersion ?? defaultPreventIncrement;
             branchConfig.TrackMergeTarget = branchConfig.TrackMergeTarget ?? defaultTrackMergeTarget;
             branchConfig.VersioningMode = branchConfig.VersioningMode ?? defaultVersioningMode ?? config.VersioningMode;
-            branchConfig.CommitMessageIncrementing = branchConfig.CommitMessageIncrementing ?? commitMessageVersionBump;
         }
 
         static Config ReadConfig(string workingDirectory, IFileSystem fileSystem)

src/GitVersionCore/GitVersionContext.cs

@@ -98,15 +98,16 @@ void CalculateEffectiveConfiguration()
             var incrementStrategy = currentBranchConfig.Value.Increment.Value;
             var preventIncrementForMergedBranchVersion = currentBranchConfig.Value.PreventIncrementOfMergedBranchVersion.Value;
             var trackMergeTarget = currentBranchConfig.Value.TrackMergeTarget.Value;
-            var commitMessageVersionBump = currentBranchConfig.Value.CommitMessageIncrementing.Value;
-
+            
             var nextVersion = configuration.NextVersion;
             var assemblyVersioningScheme = configuration.AssemblyVersioningScheme.Value;
             var gitTagPrefix = configuration.TagPrefix;
             var majorMessage = configuration.MajorVersionBumpMessage;
             var minorMessage = configuration.MinorVersionBumpMessage;
             var patchMessage = configuration.MinorVersionBumpMessage;
 
+            var commitMessageVersionBump = currentBranchConfig.Value.CommitMessageIncrementing ?? configuration.CommitMessageIncrementing.Value;
+
             Configuration = new EffectiveConfiguration(
                 assemblyVersioningScheme, versioningMode, gitTagPrefix, 
                 tag, nextVersion, incrementStrategy, currentBranchConfig.Key,