From d0e6aa529f8783cb6ff7e34cbadc46b86f0fa604 Mon Sep 17 00:00:00 2001 From: Efuri Date: Sun, 5 Apr 2026 22:19:26 +0200 Subject: [PATCH 1/2] Fix: Neovim 0.12 Compatability --- lua/git-conflict.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lua/git-conflict.lua b/lua/git-conflict.lua index 7e22434..7b107dc 100644 --- a/lua/git-conflict.lua +++ b/lua/git-conflict.lua @@ -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' @@ -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) @@ -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, }) From bf15d0c700805029ea94e63a038f619203a5b158 Mon Sep 17 00:00:00 2001 From: Efuri Date: Sun, 5 Apr 2026 22:33:56 +0200 Subject: [PATCH 2/2] Fix: also fixed re-enabling diagnostics on GitConflictResolved --- lua/git-conflict.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lua/git-conflict.lua b/lua/git-conflict.lua index 7b107dc..b868b21 100644 --- a/lua/git-conflict.lua +++ b/lua/git-conflict.lua @@ -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, })