From 1e296c41402a7fe34ca223448c1204a480bb8720 Mon Sep 17 00:00:00 2001
From: Donal McBreen <dmcbreen@gmail.com>
Date: Tue, 21 May 2024 11:38:30 +0100
Subject: [PATCH] Update sshkit_with_ext.rb

---
 lib/kamal/sshkit_with_ext.rb | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/kamal/sshkit_with_ext.rb b/lib/kamal/sshkit_with_ext.rb
index f0cdf8c8..e0c62c3a 100644
--- a/lib/kamal/sshkit_with_ext.rb
+++ b/lib/kamal/sshkit_with_ext.rb
@@ -80,8 +80,7 @@ class SSHKit::Backend::Netssh
   module LimitConcurrentStartsInstance
     private
       def with_ssh(&block)
-        host.ssh_options = (host.ssh_options || {}).merge({ port: host.port, user: host.user }.compact)
-        host.ssh_options = self.class.config.ssh_options.merge(host.ssh_options)
+        host.ssh_options = self.class.config.ssh_options.merge(host.ssh_options || {})
         self.class.pool.with(
           method(:start_with_concurrency_limit),
           String(host.hostname),