Display current branch name

next to the branch creation button
gitextensions · Dec 13, 2017 · bacf470 · bacf470
1 parent b12fdf2
commit bacf470
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 7 deletions.
diff --git a/GitUI/CommandsDialogs/FormCommit.Designer.cs b/GitUI/CommandsDialogs/FormCommit.Designer.cs
diff --git a/GitUI/CommandsDialogs/FormCommit.cs b/GitUI/CommandsDialogs/FormCommit.cs
@@ -126,6 +126,7 @@ public sealed partial class FormCommit : GitModuleForm //, IHotkeyable
             + Environment.NewLine + "Use this feature when a file is big and never change."
             + Environment.NewLine + "Git will never check if the file has changed that will improve status check performance.");
 
+        private readonly TranslationString _currentBranchLabel = new TranslationString("(On branch: {0})");
         #endregion
 
         private readonly ICommitTemplateManager _commitTemplateManager;
@@ -659,10 +660,15 @@ private void EnableStageButtons(bool enable)
             ResetUnStaged.Enabled = Unstaged.AllItems.Any();
         }
 
-        private void SetDialogTitle()
+        private void UpdateBranchNameDisplay()
         {
-            Task.Run(() => string.Format(_formTitle.Text, Module.GetSelectedBranch(), Module.WorkingDir))
-                .ContinueWith(task => Text = task.Result, _taskScheduler);
+            Task.Run(() => Module.GetSelectedBranch())
+                .ContinueWith(task =>
+                {
+                    var currentBranchName = task.Result;
+                    toolStripLabelbranchName.Text = string.Format(_currentBranchLabel.Text, currentBranchName);
+                    Text = string.Format(_formTitle.Text, currentBranchName, Module.WorkingDir);
+                }, _taskScheduler);
         }
 
         private bool _initialized;
@@ -671,7 +677,7 @@ private void Initialize(bool loadUnstaged)
         {
             _initialized = true;
 
-            SetDialogTitle();
+            UpdateBranchNameDisplay();
             Cursor.Current = Cursors.WaitCursor;
 
             if (loadUnstaged)
@@ -2775,7 +2781,7 @@ private void createBranchToolStripButton_Click(object sender, EventArgs e)
             {
                 return;
             }
-            SetDialogTitle();
+            UpdateBranchNameDisplay();
         }
 
         private void Message_Enter(object sender, EventArgs e)