mirror of
https://github.com/folke/snacks.nvim
synced 2025-12-23 08:47:57 +00:00
fix(picker.git): use unmerged icon for unmerged. Fixes #1531
This commit is contained in:
parent
149971d1b3
commit
abee3c9eff
1 changed files with 1 additions and 1 deletions
|
|
@ -586,7 +586,7 @@ function M.file_git_status(item, picker)
|
||||||
local icon = status.status:sub(1, 1):upper()
|
local icon = status.status:sub(1, 1):upper()
|
||||||
icon = status.status == "untracked" and "?" or status.status == "ignored" and "!" or icon
|
icon = status.status == "untracked" and "?" or status.status == "ignored" and "!" or icon
|
||||||
if picker.opts.icons.git.enabled then
|
if picker.opts.icons.git.enabled then
|
||||||
icon = picker.opts.icons.git[status.status] or icon --[[@as string]]
|
icon = picker.opts.icons.git[status.unmerged and "unmerged" or status.status] or icon --[[@as string]]
|
||||||
if status.staged then
|
if status.staged then
|
||||||
icon = picker.opts.icons.git.staged
|
icon = picker.opts.icons.git.staged
|
||||||
end
|
end
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue