diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | Completion/Unix/Command/_ssh | 7 |
2 files changed, 13 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog index 7fdb14252..b0190a3d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-03-05 Clint Adams <clint@zsh.org> + + * 30314: Completion/Unix/Command/_ssh: add completion for + ssh-copy-id. + 2012-03-05 Peter Stephenson <pws@csr.com> * 30307 plus change suggested by Wayne in 30309: configure.ac, @@ -29,7 +34,7 @@ reasonable output file name when the DISPLAY variable refers to a local socket file (MacOS); fix problem with writing the output file when the user overrides the default value of TERM. - + 2012-02-29 Mikael Magnusson <mikachu@gmail.com> * 30276: Src/glob.c: Use zlong rather than int when calculating @@ -16062,5 +16067,5 @@ ***************************************************** * This is used by the shell to define $ZSH_PATCHLEVEL -* $Revision: 1.5601 $ +* $Revision: 1.5602 $ ***************************************************** diff --git a/Completion/Unix/Command/_ssh b/Completion/Unix/Command/_ssh index 8f1fb74aa..023232189 100644 --- a/Completion/Unix/Command/_ssh +++ b/Completion/Unix/Command/_ssh @@ -1,4 +1,4 @@ -#compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-keygen sftp +#compdef ssh slogin=ssh scp ssh-add ssh-agent ssh-keygen sftp ssh-copy-id # Completions currently based on OpenSSH 5.9 (released on 2011-09-06). # @@ -133,6 +133,11 @@ _ssh () { '-s[SSH2 subsystem or path to sftp server on the remote host]' \ '1:file:->rfile' '*:file:->file' "$common[@]" "$common_transfer[@]" && ret=0 ;; + (ssh-copy-id) + _arguments \ + '-i:SSH identity file:_files' \ + ':remote host name:->userhost' \ + ;; esac while [[ -n "$state" ]]; do |