Skip to content

Fix: autosquash command (r f) bug is fixed. #1880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swnakamura wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −6
Open

Fix: autosquash command (r f) bug is fixed. #1880

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 9 additions & 6 deletions lua/neogit/popups/rebase/actions.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,19 +164,22 @@ function M.edit()
end

function M.autosquash(popup)
local args = util.deduplicate(util.merge(popup:get_arguments(), { "--autosquash", "--keep-empty" }))
local base
if popup.state.env.commit and git.log.is_ancestor(popup.state.env.commit, "HEAD") then
base = popup.state.env.commit
local parent = git.log.parent(popup.state.env.commit)
if parent then
base = popup.state.env.commit .. "^"
else
base = popup.state.env.commit
table.insert(args, "--root")
end
else
base = git.rebase.merge_base_HEAD()
end

if base then
git.rebase.onto(
"HEAD",
base,
util.deduplicate(util.merge(popup:get_arguments(), { "--autosquash", "--keep-empty" }))
)
git.rebase.rebase_interactive(base, args)
end
end

Expand Down
Loading