Merge pull request #8805 from pmiossec/more_message_templates

Increase the number of commit templates
gitextensions · Jan 30, 2021 · 53e88d1 · 53e88d1
2 parents 19a310e + 273f7a7
commit 53e88d1
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/GitUI/CommandsDialogs/CommitDialog/FormCommitTemplateSettings.cs b/GitUI/CommandsDialogs/CommitDialog/FormCommitTemplateSettings.cs
@@ -11,7 +11,7 @@ public partial class FormCommitTemplateSettings : GitExtensionsForm
 
         private CommitTemplateItem[] _commitTemplates;
 
-        private const int _maxCommitTemplates = 5;
+        private const int _maxCommitTemplates = 10;
         private const int _maxShownCharsForName = 50;
         private const int _maxUsedCharsForName = 80;
 
@@ -43,6 +43,16 @@ private void LoadSettings()
                     _commitTemplates[i] = new CommitTemplateItem();
                 }
             }
+            else if (_commitTemplates.Length < _maxCommitTemplates)
+            {
+                // Migration: keep the one configured and complete with empty ones
+                var previousCommitTemplates = _commitTemplates;
+                _commitTemplates = new CommitTemplateItem[_maxCommitTemplates];
+                for (int i = 0; i < _commitTemplates.Length; i++)
+                {
+                    _commitTemplates[i] = i < previousCommitTemplates.Length ? previousCommitTemplates[i] : new CommitTemplateItem();
+                }
+            }
 
             _NO_TRANSLATE_comboBoxCommitTemplates.Items.Clear();