Skip to content

Fix cygpath output handling for MSYS2 environments #1463

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

Merged
lewis6991 merged 5 commits into from
Jan 9, 2026
+7 −1
Merged

Fix cygpath output handling for MSYS2 environments #1463

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
16826d9
Initial plan
Copilot Jan 9, 2026
3b4de57
Fix: Strip trailing newlines from cygpath output on MSYS2
Copilot Jan 9, 2026
98e7942
Remove accidentally committed nvim tarball
Copilot Jan 9, 2026
da48cb9
Improve cygpath newline stripping logic
Copilot Jan 9, 2026
7264705
Add nil check before pattern matching in cygpath
Copilot Jan 9, 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
8 changes: 7 additions & 1 deletion lua/gitsigns/util.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,7 +440,13 @@ function M.cygpath(path, mode)

async.schedule()

return assert(vim.split(stdout, '\n')[1])
local result = vim.split(stdout, '\n')[1]
-- Strip trailing newline/carriage return that may be present in cygpath output on MSYS2
if result then
result = result:match('^(.-)[\r\n]*$')
end

return assert(result)
end

--- Flattens a nested table structure into a flat array of strings. Only
Expand Down
Loading