Skip to content

Fix bad merge for remote server #9652

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
kevinyang372 merged 1 commit into from
Apr 30, 2026
+2 −2
Merged

Fix bad merge for remote server #9652

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/src/remote_server/ssh_transport.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,10 +190,10 @@ impl RemoteTransport for SshTransport {
executor: Arc<executor::Background>,
) -> Pin<Box<dyn Future<Output = Result<Connection>> + Send>> {
let socket_path = self.socket_path.clone();
let remote_proxy_command = self.remote_proxy_command();
Box::pin(async move {
let binary = remote_server::setup::remote_server_binary();
let mut args = remote_server::ssh::ssh_args(&socket_path);
args.push(format!("{binary} remote-server-proxy"));
args.push(remote_proxy_command);

// `kill_on_drop(true)` pairs with ownership of the `Child` being
// returned in the [`Connection`] below: the
Expand Down
Loading