feat: Spin out/off branch

lua/neogit/popups/branch/actions.lua

@@ -22,6 +22,40 @@ local function parse_remote_branch_name(ref)
   return remote, branch_name
 end
 
+M.spin_off_branch = operation("spin_off_branch", function()
+  if #git.repo.staged.items > 0 or #git.repo.unstaged.items > 0 then
+    notif.create("Staying on current branch as there are uncommitted changes.", vim.log.levels.INFO)
+    return
+  end
+
+  local name = git.branch.create()
+
+  local upstream = git.repo.upstream.ref
+  if upstream then
+    git.cli.reset.hard.args(upstream).call_sync()
+  end
+
+  git.cli.checkout.branch(name).call_sync()
+
+  status.refresh(true, "spin_off_branch")
+end)
+
+M.spin_out_branch = operation("spin_out_branch", function()
+  if #git.repo.staged.items > 0 or #git.repo.unstaged.items > 0 then
+    notif.create("Staying on current branch as there are uncommitted changes.", vim.log.levels.INFO)
+    return
+  end
+
+  git.branch.create()
+
+  local upstream = git.repo.upstream.ref
+  if upstream then
+    git.cli.reset.hard.args(upstream).call_sync()
+  end
+
+  status.refresh(true, "spin_out_branch")
+end)
+
 M.checkout_branch_revision = operation("checkout_branch_revision", function(popup)
   local selected_branch = FuzzyFinderBuffer.new(git.branch.get_all_branches()):open_async()
   if not selected_branch then

lua/neogit/popups/branch/init.lua

@@ -35,11 +35,11 @@ function M.create()
     :action("l", "local branch", actions.checkout_local_branch)
     :new_action_group()
     :action("c", "new branch", actions.checkout_create_branch)
-    :action("s", "new spin-off")
+    :action("s", "new spin-off", actions.spin_off_branch)
     :action("w", "new worktree")
     :new_action_group("Create")
     :action("n", "new branch", actions.create_branch)
-    :action("S", "new spin-out")
+    :action("S", "new spin-out", actions.spin_out_branch)
     :action("W", "new worktree")
     :new_action_group("Do")
     :action("C", "Configure...", actions.configure_branch)

tests/specs/neogit/operations_spec.lua

@@ -46,4 +46,24 @@ describe("branch popup", function()
       eq("branch-from-test", get_current_branch())
     end)
   )
+
+  it(
+    "can spin off a branch",
+    in_prepared_repo(function()
+      input.value = "spin-off-branch"
+      act("bs<cr><cr>")
+      operations.wait("spin_off_branch")
+      eq("spin-off-branch", get_current_branch())
+    end)
+  )
+
+  it(
+    "can spin out a branch",
+    in_prepared_repo(function()
+      input.value = "spin-out-branch"
+      act("bS<cr><cr>")
+      operations.wait("spin_out_branch")
+      eq("master", get_current_branch())
+    end)
+  )
 end)