Fix ssh kitten override parsing ignoring settings inherited from ssh.conf

Fixes #6639
This commit is contained in:
Kovid Goyal
2023-09-20 09:12:48 +05:30
parent 18e5b74699
commit b21bbbe14c
5 changed files with 34 additions and 11 deletions

View File

@@ -43,6 +43,14 @@ The :doc:`ssh kitten <kittens/ssh>` is redesigned with powerful new features:
Detailed list of changes
-------------------------------------
0.30.1 [future]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ssh kitten: Fix a regression in 0.28.0 that caused using ``--kitten`` to
override :file:`ssh.conf` not inheriting settings from :file:`ssh.conf`
(:iss:`6639`)
0.30.0 [2023-09-18]
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

View File

@@ -82,10 +82,10 @@ Additionally, you can pass config options on the command line:
kitty +kitten ssh --kitten interpreter=python servername
The :code:`--kitten` argument can be specified multiple times, with directives
from :file:`ssh.conf`. These are merged with :file:`ssh.conf` as if they were
appended to the end of that file. They apply only to the host being SSHed to by
this invocation, so any :opt:`hostname <kitten-ssh.hostname>` directives are
ignored.
from :file:`ssh.conf`. These override the final options used for the matched host, as if they
had been appended to the end of the matching section for that host in
:file:`ssh.conf`. They apply only to the host being SSHed to by this invocation,
so any :opt:`hostname <kitten-ssh.hostname>` directives are ignored.
.. warning::