Skip to content

fix: correct worktree path handling on Windows #1665

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

fix: correct worktree path handling on Windows #1665

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9a78ac4
fix: correct worktree path handling on Windows
Valley-15 Apr 5, 2026
714c833
fix: address review comments for path normalization
Valley-15 Apr 5, 2026
2042d4c
fix: normalize cwd executeCommandViaCli for Windows paths
Valley-15 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
9 changes: 7 additions & 2 deletions src/main/services/ssh/SshService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,9 @@ export class SshService extends EventEmitter {
// Build the command with optional cwd, wrapped in a login shell so that
// ~/.ssh/config, ~/.gitconfig, and other user-level configuration files
// are available (ssh2's client.exec() uses a non-login shell by default).
const innerCommand = cwd ? `cd ${quoteShellArg(cwd)} && ${command}` : command;
const safeCwd = cwd ? cwd.replace(/\\/g, '/') : undefined;
const innerCommand = safeCwd ? `cd ${quoteShellArg(safeCwd)} && ${command}` : command;

const fullCommand = `bash -l -c ${quoteShellArg(innerCommand)}`;

return new Promise((resolve, reject) => {
Expand Down Expand Up @@ -446,7 +448,10 @@ export class SshService extends EventEmitter {
}

const target = row.username ? `${row.username}@${row.host}` : row.host;
const innerCommand = cwd ? `cd ${quoteShellArg(cwd)} && ${command}` : command;

const safeCwd = cwd ? cwd.replace(/\\/g, '/') : undefined;
const innerCommand = safeCwd ? `cd ${quoteShellArg(safeCwd)} && ${command}` : command;

const fullCommand = `bash -l -c ${quoteShellArg(innerCommand)}`;

try {
Expand Down
Loading