Skip to content

When merging a remote branch with rebase, and a conflict occurs, show #1346

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

Merged
merged 1 commit into from
May 31, 2024
Merged

When merging a remote branch with rebase, and a conflict occurs, show #1346

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
22 changes: 16 additions & 6 deletions lua/neogit/lib/git/rebase.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,21 @@ end
---@field ref string
---@field is_remote boolean

local function rev_name(oid)
local result = git.cli["name-rev"].name_only.no_undefined
.refs("refs/heads/*")
.exclude("*/HEAD")
.exclude("*/refs/heads/*")
.args(oid)
.call { hidden = true, ignore_error = true }

if result.code == 0 then
return result.stdout[1]
else
return oid
end
end

function M.update_rebase_status(state)
state.rebase = { items = {}, onto = {}, head = nil, current = nil }

Expand All @@ -185,12 +200,7 @@ function M.update_rebase_status(state)
if onto:exists() then
state.rebase.onto.oid = vim.trim(onto:read())
state.rebase.onto.subject = git.log.message(state.rebase.onto.oid)
state.rebase.onto.ref = git.cli["name-rev"].name_only.no_undefined
.refs("refs/heads/*")
.exclude("*/HEAD")
.exclude("*/refs/heads/*")
.args(state.rebase.onto.oid)
.call({ hidden = true }).stdout[1]
state.rebase.onto.ref = rev_name(state.rebase.onto.oid)
state.rebase.onto.is_remote = not git.branch.exists(state.rebase.onto.ref)
end

Expand Down