Skip to content

Commit

Permalink
feat: add support for git worktrees (#81)
Browse files Browse the repository at this point in the history
This fixes #30
  • Loading branch information
chase authored May 25, 2024
1 parent 4c8e252 commit 1371080
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lua/git-conflict.lua
Original file line number Diff line number Diff line change
Expand Up @@ -617,7 +617,7 @@ function M.setup(user_config)
group = AUGROUP_NAME,
callback = function(args)
local gitdir = fn.getcwd() .. sep .. '.git'
if fn.isdirectory(gitdir) == 0 or state.current_watcher_dir == fn.getcwd() then return end
if 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 Down

0 comments on commit 1371080

Please sign in to comment.