Dont confirm switch worktree option (gitextensions#6864)

KarstenRa · Oct 2, 2019 · 497448b · 497448b
1 parent 429a4f0
commit 497448b
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 2 deletions.
diff --git a/GitCommands/Settings/AppSettings.cs b/GitCommands/Settings/AppSettings.cs
@@ -884,6 +884,12 @@ public static bool DontConfirmFetchAndPruneAll
             set => SetBool("DontConfirmFetchAndPruneAll", value);
         }
 
+        public static bool DontConfirmSwitchWorktree
+        {
+            get => GetBool("DontConfirmSwitchWorktree", false);
+            set => SetBool("DontConfirmSwitchWorktree", value);
+        }
+
         public static bool IncludeUntrackedFilesInAutoStash
         {
             get => GetBool("includeUntrackedFilesInAutoStash", false);

diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ConfirmationsSettingsPage.Designer.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ConfirmationsSettingsPage.Designer.cs
diff --git a/GitUI/CommandsDialogs/SettingsDialog/Pages/ConfirmationsSettingsPage.cs b/GitUI/CommandsDialogs/SettingsDialog/Pages/ConfirmationsSettingsPage.cs
@@ -28,6 +28,7 @@ protected override void SettingsToPage()
             chkRebaseOnTopOfSelectedCommit.Checked = AppSettings.DontConfirmRebase;
             chkUndoLastCommitConfirmation.Checked = AppSettings.DontConfirmUndoLastCommit;
             chkFetchAndPruneAllConfirmation.Checked = AppSettings.DontConfirmFetchAndPruneAll;
+            chkSwitchWorktree.Checked = AppSettings.DontConfirmSwitchWorktree;
         }
 
         protected override void PageToSettings()
@@ -46,6 +47,7 @@ protected override void PageToSettings()
             AppSettings.DontConfirmRebase = chkRebaseOnTopOfSelectedCommit.Checked;
             AppSettings.DontConfirmUndoLastCommit = chkUndoLastCommitConfirmation.Checked;
             AppSettings.DontConfirmFetchAndPruneAll = chkFetchAndPruneAllConfirmation.Checked;
+            AppSettings.DontConfirmSwitchWorktree = chkSwitchWorktree.Checked;
         }
 
         public static SettingsPageReference GetPageReference()

diff --git a/GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.cs b/GitUI/CommandsDialogs/WorktreeDialog/FormManageWorktree.cs
@@ -207,8 +207,8 @@ private void Worktrees_CellClick(object sender, DataGridViewCellEventArgs e)
 
             if (e.ColumnIndex == 5)
             {
-                if (MessageBox.Show(this, "Are you sure you want to switch to this worktree?", "Open a worktree",
-                    MessageBoxButtons.YesNo) == DialogResult.Yes)
+                if (AppSettings.DontConfirmSwitchWorktree || MessageBox.Show(this,
+                        "Are you sure you want to switch to this worktree?", "Open a worktree", MessageBoxButtons.YesNo) == DialogResult.Yes)
                 {
                     if (Directory.Exists(workTree.Path))
                     {