Disable hotkeys in scenarios where their usage was not intended (#11109)

Fixes #11108
gitextensions · Aug 1, 2023 · c940ea1 · c940ea1
1 parent b13b0c8
commit c940ea1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/GitUI/CommandsDialogs/FormBrowse.cs b/GitUI/CommandsDialogs/FormBrowse.cs
@@ -1525,7 +1525,7 @@ private void RebaseToolStripMenuItemClick(object sender, EventArgs e)
         {
             var revisions = RevisionGrid.GetSelectedRevisions();
 
-            if (revisions.Count == 0)
+            if (revisions.Count == 0 || revisions[0].IsArtificial)
             {
                 return;
             }

diff --git a/GitUI/GitUICommands.cs b/GitUI/GitUICommands.cs
@@ -440,6 +440,11 @@ public bool StartCreateBranchDialog(IWin32Window? owner, string? branch)
 
         public bool StartCreateBranchDialog(IWin32Window? owner = null, ObjectId? objectId = null, string? newBranchNamePrefix = null)
         {
+            if (Module.IsBareRepository() || objectId?.IsArtificial is true)
+            {
+                return false;
+            }
+
             bool Action()
             {
                 using FormCreateBranch form = new(this, objectId, newBranchNamePrefix);
@@ -853,6 +858,11 @@ bool Action()
 
         public bool StartCreateTagDialog(IWin32Window? owner = null, GitRevision? revision = null)
         {
+            if (revision?.IsArtificial is true)
+            {
+                 return false;
+            }
+
             bool Action()
             {
                 using FormCreateTag form = new(this, revision?.ObjectId);