Skip to content

Fix: Improve PrevMessage and NextMessage in the commit window #1871

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
entomb411 wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −6
Open

Fix: Improve PrevMessage and NextMessage in the commit window #1871

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions lua/neogit/buffers/editor/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@ function M:open(kind)
local message_buffer = { { "" } }
local amend_header, footer

local function reflog_message(index)
return git.log.reflog_message(index - 2)
local function log_message(index)
return git.log.log_message(index - 2)
end

local function commit_message()
return message_buffer[message_index] or reflog_message(message_index)
return message_buffer[message_index] or log_message(message_index)
end

local function current_message(buffer)
Expand Down Expand Up @@ -262,7 +262,7 @@ function M:open(kind)
[mapping["ResetMessage"]] = function(buffer)
logger.debug("[EDITOR] Action N: ResetMessage")
local message = current_message(buffer)
buffer:set_lines(0, #message, false, reflog_message(message_index))
buffer:set_lines(0, #message, false, log_message(message_index))
buffer:move_cursor(1)
end,
},
Expand Down
4 changes: 2 additions & 2 deletions lua/neogit/lib/git/log.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,11 +555,11 @@ M.branch_info = util.memoize(function(ref, remotes)
return result
end)

function M.reflog_message(skip)
function M.log_message(skip)
return git.cli.log
.format("%B")
.max_count(1)
.args("--reflog", "--no-merges", "--skip=" .. tostring(skip))
.args("--no-merges", "--skip=" .. tostring(skip))
.call({ ignore_error = true }).stdout
end

Expand Down
Loading