Skip to content

Fix stash diff error by adding nil check for stash_id #1756

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

Fix stash diff error by adding nil check for stash_id #1756

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
4 changes: 2 additions & 2 deletions lua/neogit/buffers/stash_list_view/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ function M:open()
[popups.mapping_for("DiffPopup")] = popups.open("diff", function(p)
local items = self.buffer.ui:get_commits_in_selection()
p {
section = { name = "log" },
section = { name = "stashes" },
item = { name = items },
}
end),
Expand Down Expand Up @@ -166,7 +166,7 @@ function M:open()
[popups.mapping_for("DiffPopup")] = popups.open("diff", function(p)
local item = self.buffer.ui:get_commit_under_cursor()
p {
section = { name = "log" },
section = { name = "stashes" },
item = { name = item },
}
end),
Expand Down
37 changes: 32 additions & 5 deletions lua/neogit/integrations/diffview.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,21 @@ local dv_utils = require("diffview.utils")
local Watcher = require("neogit.watcher")
local git = require("neogit.lib.git")
local a = require("plenary.async")
local notification = require("neogit.lib.notification")

local function check_valid_item(item_name, section_type)
if
not item_name
or (type(item_name) == "string" and item_name == "")
or (type(item_name) == "table" and (#item_name == 0 or not item_name[1] or item_name[1] == ""))
then
notification.warn(
"Cannot diff the " .. section_type .. " heading. Please select a specific " .. section_type .. " item."
)
return false
end
return true
end

local function get_local_diff_view(section_name, item_name, opts)
local left = Rev(RevType.STAGE)
Expand Down Expand Up @@ -116,25 +131,37 @@ function M.open(section_name, item_name, opts)
or section_name == "log"
or (section_name and section_name:match("unmerged$"))
then
if not check_valid_item(item_name, "commit") then
return
end

local range
if type(item_name) == "table" then
range = string.format("%s..%s", item_name[1], item_name[#item_name])
elseif item_name ~= nil then
range = string.format("%s^!", item_name:match("[a-f0-9]+"))
else
return
local commit_hash = item_name:match("[a-f0-9]+")
if not commit_hash then
notification.warn("Invalid commit hash format")
return
end
range = string.format("%s^!", commit_hash)
end

view = dv_lib.diffview_open(dv_utils.tbl_pack(range))
elseif section_name == "range" then
local range = item_name
view = dv_lib.diffview_open(dv_utils.tbl_pack(range))
elseif section_name == "stashes" then
assert(item_name and type(item_name) == "string", "No item name for stash!")
if not check_valid_item(item_name, "stash") then
return
end

local stash_id = item_name:match("stash@{%d+}")
local stash_id = item_name:match("stash@{%d+}") or item_name
view = dv_lib.diffview_open(dv_utils.tbl_pack(stash_id .. "^!"))
elseif section_name == "commit" then
if not check_valid_item(item_name, "commit") then
return
end
view = dv_lib.diffview_open(dv_utils.tbl_pack(item_name .. "^!"))
elseif section_name == "conflict" and item_name then
view = dv_lib.diffview_open(dv_utils.tbl_pack("--selected-file=" .. item_name))
Expand Down
Loading