tomas.mirchev/nvim-tree.lua
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(#2459): disable cygwin git support by default, see :help nvim-tree.git.cygwin_support to enable (#2486)

Browse Source
This commit is contained in:
Alexander Courtis 2023-10-21 16:34:34 +11:00 committed by GitHub
parent 8b4dbc57e4
commit db8145c27d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
doc/nvim-tree-lua.txt
View File

@ -473,6 +473,7 @@ Following is the default configuration. See |nvim-tree-opts| for details.
show_on_open_dirs = true, show_on_open_dirs = true,
disable_for_dirs = {}, disable_for_dirs = {},
timeout = 400, timeout = 400,
cygwin_support = false,
}, },
diagnostics = { diagnostics = {
enable = false, enable = false,
@ -1118,6 +1119,10 @@ Kills the git process after some time if it takes too long.
Git integration will be disabled after 10 git jobs exceed this timeout. Git integration will be disabled after 10 git jobs exceed this timeout.
Type: `number`, Default: `400` (ms) Type: `number`, Default: `400` (ms)
*nvim-tree.git.cygwin_support*
Use `cygpath` if available to resolve paths for git.
Type: `boolean`, Default: `false`
============================================================================== ==============================================================================
5.8 OPTS: DIAGNOSTICS *nvim-tree-opts-diagnostics* 5.8 OPTS: DIAGNOSTICS *nvim-tree-opts-diagnostics*

2
lua/nvim-tree.lua
View File

@ -496,6 +496,7 @@ local DEFAULT_OPTS = { -- BEGIN_DEFAULT_OPTS
show_on_open_dirs = true, show_on_open_dirs = true,
disable_for_dirs = {}, disable_for_dirs = {},
timeout = 400, timeout = 400,
cygwin_support = false,
}, },
diagnostics = { diagnostics = {
enable = false, enable = false,
@ -794,6 +795,7 @@ function M.setup(conf)
require("nvim-tree.diagnostics").setup(opts) require("nvim-tree.diagnostics").setup(opts)
require("nvim-tree.explorer").setup(opts) require("nvim-tree.explorer").setup(opts)
require("nvim-tree.git").setup(opts) require("nvim-tree.git").setup(opts)
require("nvim-tree.git.utils").setup(opts)
require("nvim-tree.view").setup(opts) require("nvim-tree.view").setup(opts)
require("nvim-tree.lib").setup(opts) require("nvim-tree.lib").setup(opts)
require("nvim-tree.renderer").setup(opts) require("nvim-tree.renderer").setup(opts)

13
lua/nvim-tree/git/utils.lua
View File

@ -1,8 +1,9 @@
local M = {}
local log = require "nvim-tree.log" local log = require "nvim-tree.log"
local utils = require "nvim-tree.utils" local utils = require "nvim-tree.utils"
local has_cygpath = vim.fn.executable "cygpath" == 1 local M = {
use_cygpath = false,
}
--- Retrieve the git toplevel directory --- Retrieve the git toplevel directory
--- @param cwd string path --- @param cwd string path
@ -35,7 +36,7 @@ function M.get_toplevel(cwd)
-- git always returns path with forward slashes -- git always returns path with forward slashes
if vim.fn.has "win32" == 1 then if vim.fn.has "win32" == 1 then
-- msys2 git support -- msys2 git support
if has_cygpath then if M.use_cygpath then
toplevel = vim.fn.system("cygpath -w " .. vim.fn.shellescape(toplevel)) toplevel = vim.fn.system("cygpath -w " .. vim.fn.shellescape(toplevel))
if vim.v.shell_error ~= 0 then if vim.v.shell_error ~= 0 then
return nil, nil return nil, nil
@ -112,4 +113,10 @@ function M.file_status_to_dir_status(status, cwd)
return r return r
end end
function M.setup(opts)
if opts.git.cygwin_support then
M.use_cygpath = vim.fn.executable "cygpath" == 1
end
end
return M return M