Direct context menu checkouts to use correct parent branch on staged …

…GitNode
EPICLab · Nov 2, 2023 · b8512d3 · b8512d3
1 parent c655211
commit b8512d3
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/packages/renderer/src/components/GitGraph/ContextMenu.tsx b/packages/renderer/src/components/GitGraph/ContextMenu.tsx
@@ -163,18 +163,20 @@ const ContextMenu = ({
 
   const actions: Action[] = [
     ...node.data.parents
-      .map(parent => repoBranches.find(b => b.head === parent))
+      .map(parent =>
+        repoBranches.find(b => b.head === parent && `${b.scope}/${b.ref}*` === node.data.oid),
+      )
       .filter(isDefined)
       .map(branch => ({
         icon: <GitBranch />,
         name: `Checkout ${branch.scope}/${branch.ref}`,
-        disabled: !node.data.staged,
+        disabled: !node.data.staged, // only show parents when staged
         onClick: () => checkout({id: branch.id}),
       })),
     ...node.data.heads.map(branch => ({
       icon: <GitBranch />,
       name: `Checkout ${branches[branch]?.scope}/${branches[branch]?.ref}`,
-      disabled: node.data.staged,
+      disabled: node.data.staged, // only show when not staged
       onClick: () => checkout({id: branch}),
     })),
     {