From 707cefd78a8952c1a38763df6728761518445ef8 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 24 Jun 2023 09:14:25 +0530 Subject: [PATCH] ssh kitten: When both passthrough args and --kitten args are present dont fail just ignore the kitten args --- kittens/ssh/main.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/kittens/ssh/main.go b/kittens/ssh/main.go index 8aa21c56b..a6c209a4c 100644 --- a/kittens/ssh/main.go +++ b/kittens/ssh/main.go @@ -735,10 +735,7 @@ func main(cmd *cli.Command, o *Options, args []string) (rc int, err error) { return 1, err } if passthrough { - if len(found_extra_args) > 0 { - return 1, fmt.Errorf("The SSH kitten cannot work with the options: %s", strings.Join(maps.Keys(PassthroughArgs()), " ")) - } - return 1, unix.Exec(SSHExe(), append([]string{"ssh"}, args...), os.Environ()) + return 1, unix.Exec(SSHExe(), utils.Concat([]string{"ssh"}, ssh_args, server_args), os.Environ()) } if os.Getenv("KITTY_WINDOW_ID") == "" || os.Getenv("KITTY_PID") == "" { return 1, fmt.Errorf("The SSH kitten is meant to run inside a kitty window")