fix(picker.git): use unmerged icon for unmerged. Fixes #1531

This commit is contained in:
Folke Lemaitre 2025-10-20 17:31:43 +02:00
parent 149971d1b3
commit abee3c9eff
No known key found for this signature in database
GPG key ID: 9B52594D560070AB

View file

@ -586,7 +586,7 @@ function M.file_git_status(item, picker)
local icon = status.status:sub(1, 1):upper()
icon = status.status == "untracked" and "?" or status.status == "ignored" and "!" or icon
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
icon = picker.opts.icons.git.staged
end