Merge pull request NeogitOrg#1011 from NeogitOrg/fix/rebase-root

Aphosis · Dec 12, 2023 · 38a62b3 · 38a62b3
2 parents 0cdc73e + 98d3064
commit 38a62b3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/lua/neogit/lib/git/cli.lua b/lua/neogit/lib/git/cli.lua
@@ -487,6 +487,7 @@ local configurations = {
 
   ["rev-list"] = config {
     flags = {
+      merges = "--merges",
       parents = "--parents",
     },
     options = {

diff --git a/lua/neogit/lib/git/log.lua b/lua/neogit/lib/git/log.lua
@@ -424,6 +424,13 @@ function M.is_ancestor(a, b)
   return cli["merge-base"].is_ancestor.args(a, b).call_sync({ ignore_error = true, hidden = true }).code == 0
 end
 
+---Finds parent commit of a commit. If no parent exists, will return nil
+---@param commit string
+---@return string|nil
+function M.parent(commit)
+  return vim.split(cli["rev-list"].max_count(1).parents.args(commit).call({ hidden = true }).stdout[1], " ")[2]
+end
+
 local function update_recent(state)
   local count = config.values.status.recent_commit_count
   if count < 1 then

diff --git a/lua/neogit/lib/git/rebase.lua b/lua/neogit/lib/git/rebase.lua
@@ -17,6 +17,10 @@ local function rebase_command(cmd)
 end
 
 function M.rebase_interactive(commit, args)
+  if vim.tbl_contains(args, "--root") then
+    commit = ""
+  end
+
   local result = rebase_command(cli.rebase.interactive.args(commit).arg_list(args))
   if result.code ~= 0 then
     notification.error("Rebasing failed. Resolve conflicts before continuing")

diff --git a/lua/neogit/lib/git/remote.lua b/lua/neogit/lib/git/remote.lua
@@ -48,11 +48,11 @@ function M.prune(name)
 end
 
 function M.list()
-  return cli.remote.call_sync().stdout
+  return cli.remote.call_sync({ hidden = true }).stdout
 end
 
 function M.get_url(name)
-  return cli.remote.get_url(name).call().stdout
+  return cli.remote.get_url(name).call({ hidden = true }).stdout
 end
 
 return M
diff --git a/lua/neogit/popups/rebase/actions.lua b/lua/neogit/popups/rebase/actions.lua
@@ -1,5 +1,6 @@
 local git = require("neogit.lib.git")
 local input = require("neogit.lib.input")
+local notification = require("neogit.lib.notification")
 
 local CommitSelectViewBuffer = require("neogit.buffers.commit_select_view")
 local FuzzyFinderBuffer = require("neogit.buffers.fuzzy_finder")
@@ -65,14 +66,38 @@ function M.interactively(popup)
   if popup.state.env.commit then
     commit = popup.state.env.commit
   else
-    commit = CommitSelectViewBuffer.new(git.log.list()):open_async()[1]
+    commit = CommitSelectViewBuffer.new(git.log.list({}, {}, {}, true)):open_async()[1]
   end
 
   if commit then
+    if not git.log.is_ancestor(commit, "HEAD") then
+      notification.warn("Commit isn't an ancestor of HEAD")
+      return
+    end
+
     local args = popup:get_arguments()
-    local parent_commit = git.cli["rev-list"].max_count(1).parents.args(commit).call().stdout[1]
-    if commit ~= parent_commit then
-      commit = vim.split(parent_commit, " ")[2]
+
+    local merges = git.cli["rev-list"].merges.args(commit .. "..HEAD").call().stdout
+    if merges[1] then
+      local choice = input.get_choice("Proceed despite merge in rebase range?", {
+        values = { "&continue", "&select other", "&abort" },
+        default = 1,
+      })
+
+      -- selene: allow(empty_if)
+      if choice == "c" then
+        -- no-op
+      elseif choice == "s" then
+        popup.state.env.commit = nil
+        M.interactively(popup)
+      else
+        return
+      end
+    end
+
+    local parent = git.log.parent(commit)
+    if parent then
+      commit = commit .. "^"
     else
       table.insert(args, "--root")
     end