Autosquash (`r f`) discards commits instead of squashing

[loqusion]

Description

Autosquash functionality (default keybind: r f) in Neogit does not seem to work as intended. Instead of squashing commits starting with fixup! /squash! /amend! into the commits they target, it resets the current branch to the selected commit.

Neovim version

NVIM v0.10.3 Build type: RelWithDebInfo LuaJIT 2.1.1731601260

Operating system and version

Arch Linux (6.12.7.zen1-1)

Steps to reproduce

1. Clone https://github.com/loqusion/neogit-autosquash-bug-repro
2. cd to the local repo, open Neovim (nvim -u minimal.lua), and type :Neogit<CR>
3. Press <Tab> on Recent Commits and hover over the last commit with the message initial commit (alternatively, hover over the commit in the log view)
4. Press r f

Expected behavior

Magit for Emacs runs the command git … rebase -i --root --autosquash --keep-empty --autostash, triggering a merge conflict as expected in this particular case.

The general case where there are no merge conflicts also works as expected: the fixup commit is squashed into the commit it targets.

Actual behavior

Neogit runs the command git rebase --onto 7313e5cd4f7b9c2723e011f233bf88e44107e8d7 HEAD --autostash --autosquash --keep-empty. The current branch now points to 7313e5c (initial commit).

This behavior does not depend on the target commit being the root commit: performing the same operation on second commit and renaming the fixup commit to fixup! second commit similarly results in the current branch pointing to second commit without squashing the fixup commit.

[!NOTE] I've also reproduced the bug with minimal.lua off camera.

Minimal config

-- NOTE: See the end of this file if you are reporting an issue, etc. Ignore all the "scary" functions up top, those are
-- used for setup and other operations.
local M = {}

local base_root_path = vim.fn.fnamemodify(debug.getinfo(1, "S").source:sub(2), ":p:h") .. "/.min"
function M.root(path)
  return base_root_path .. "/" .. (path or "")
end

function M.load_plugin(plugin_name, plugin_url)
  local package_root = M.root("plugins/")
  local install_destination = package_root .. plugin_name
  vim.opt.runtimepath:append(install_destination)

  if not vim.loop.fs_stat(package_root) then
    vim.fn.mkdir(package_root, "p")
  end

  if not vim.loop.fs_stat(install_destination) then
    print(string.format("> Downloading plugin '%s' to '%s'", plugin_name, install_destination))
    vim.fn.system({
      "git",
      "clone",
      "--depth=1",
      plugin_url,
      install_destination,
    })
    if vim.v.shell_error > 0 then
      error(string.format("> Failed to clone plugin: '%s' in '%s'!", plugin_name, install_destination),
        vim.log.levels.ERROR)
    end
  end
end

---@alias PluginName string The plugin name, will be used as part of the git clone destination
---@alias PluginUrl string The git url at which a plugin is located, can be a path. See https://git-scm.com/book/en/v2/Git-on-the-Server-The-Protocols for details
---@alias MinPlugins table<PluginName, PluginUrl>

---Do the initial setup. Downloads plugins, ensures the minimal init does not pollute the filesystem by keeping
---everything self contained to the CWD of the minimal init file. Run prior to running tests, reproducing issues, etc.
---@param plugins? table<PluginName, PluginUrl>
function M.setup(plugins)
  vim.opt.packpath = {}                      -- Empty the package path so we use only the plugins specified
  vim.opt.runtimepath:append(M.root(".min")) -- Ensure the runtime detects the root min dir

  -- Install required plugins
  if plugins ~= nil then
    for plugin_name, plugin_url in pairs(plugins) do
      M.load_plugin(plugin_name, plugin_url)
    end
  end

  vim.env.XDG_CONFIG_HOME = M.root("xdg/config")
  vim.env.XDG_DATA_HOME = M.root("xdg/data")
  vim.env.XDG_STATE_HOME = M.root("xdg/state")
  vim.env.XDG_CACHE_HOME = M.root("xdg/cache")

  -- NOTE: Cleanup the xdg cache on exit so new runs of the minimal init doesn't share any previous state, e.g. shada
  vim.api.nvim_create_autocmd("VimLeave", {
    callback = function()
      vim.fn.system({
        "rm",
        "-r",
        "-f",
        M.root("xdg")
      })
    end
  })
end

-- NOTE: If you have additional plugins you need to install to reproduce your issue, include them in the plugins
-- table within the setup call below.
M.setup({
  plenary = "https://github.com/nvim-lua/plenary.nvim.git",
  telescope = "https://github.com/nvim-telescope/telescope.nvim",
  diffview = "https://github.com/sindrets/diffview.nvim",
  neogit = "https://github.com/NeogitOrg/neogit"
})
-- WARN: Do all plugin setup, test runs, reproductions, etc. AFTER calling setup with a list of plugins!
-- Basically, do all that stuff AFTER this line.
require("neogit").setup({}) -- For instance, setup Neogit

[swnakamura]

Hi, I made a fix on this issue and it seems to work in my environment. Can you try https://github.com/swnakamura/neogit/tree/feat/fix-autosquash

[disrupted]

@swnakamura thanks for the fix! I ran into the same issue and this indeed fixes it