Skip to content

Fix: Neovim 0.12 Compatability #125

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
eric-furufors wants to merge 2 commits into
base: main
Choose a base branch
from
+5 −5
Open

Fix: Neovim 0.12 Compatability #125

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0e6aa5
Fix: Neovim 0.12 Compatability
Apr 5, 2026
bf15d0c
Fix: also fixed re-enabling diagnostics on GitConflictResolved
Apr 5, 2026
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
10 changes: 5 additions & 5 deletions lua/git-conflict.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ local ANCESTOR_HL = 'GitConflictAncestor'
local CURRENT_LABEL_HL = 'GitConflictCurrentLabel'
local INCOMING_LABEL_HL = 'GitConflictIncomingLabel'
local ANCESTOR_LABEL_HL = 'GitConflictAncestorLabel'
local PRIORITY = vim.highlight.priorities.user
local PRIORITY = vim.hl.priorities.user
local NAMESPACE = api.nvim_create_namespace('git-conflict')
local AUGROUP_NAME = 'GitConflictCommands'

Expand Down Expand Up @@ -629,8 +629,8 @@ function M.setup(user_config)
api.nvim_create_autocmd({ 'VimEnter', 'BufRead', 'SessionLoadPost', 'DirChanged' }, {
group = AUGROUP_NAME,
callback = function(args)
local gitdir = fn.getcwd() .. sep .. '.git'
if not vim.loop.fs_stat(gitdir) or state.current_watcher_dir == fn.getcwd() then return end
local gitdir = vim.fs.find('.git', { upward = true, path = fn.getcwd() })[1]
if not gitdir or not vim.loop.fs_stat(gitdir) or state.current_watcher_dir == fn.getcwd() then return end
stop_running_watchers(gitdir)
fetch_conflicts(args.buf)
throttled_watcher(gitdir)
Expand All @@ -652,7 +652,7 @@ function M.setup(user_config)
pattern = 'GitConflictDetected',
callback = function()
local bufnr = api.nvim_get_current_buf()
if config.disable_diagnostics then vim.diagnostic.disable(bufnr) end
if config.disable_diagnostics then vim.diagnostic.enable(false, { bufnr = bufnr }) end
if config.default_mappings then setup_buffer_mappings(bufnr) end
end,
})
Expand All @@ -662,7 +662,7 @@ function M.setup(user_config)
pattern = 'GitConflictResolved',
callback = function()
local bufnr = api.nvim_get_current_buf()
if config.disable_diagnostics then vim.diagnostic.enable(bufnr) end
if config.disable_diagnostics then vim.diagnostic.enable(true, { bufnr = bufnr }) end
if config.default_mappings then clear_buffer_mappings(bufnr) end
end,
})
Expand Down