diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:48 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-04-25 13:28:48 +0900 |
| commit | 8b09611475b6095003a08baccb136e885e11a1dd (patch) | |
| tree | 7a8f22979426220f53997b67659912c2e261741e | |
| parent | Merge branch 'svn/authors-prog-2' of git://bogomips.org/git-svn (diff) | |
| parent | Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files (diff) | |
| download | tgif-8b09611475b6095003a08baccb136e885e11a1dd.tar.xz | |
Merge branch 'bb/git-gui-ssh-key-files'
"git gui" learned that "~/.ssh/id_ecdsa.pub" and
"~/.ssh/id_ed25519.pub" are also possible SSH key files.
* bb/git-gui-ssh-key-files:
git-gui: search for all current SSH key types
| -rw-r--r-- | git-gui/lib/sshkey.tcl | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/git-gui/lib/sshkey.tcl b/git-gui/lib/sshkey.tcl index aa6457bbb5..589ff8f78a 100644 --- a/git-gui/lib/sshkey.tcl +++ b/git-gui/lib/sshkey.tcl @@ -2,7 +2,10 @@ # Copyright (C) 2006, 2007 Shawn Pearce proc find_ssh_key {} { - foreach name {~/.ssh/id_dsa.pub ~/.ssh/id_rsa.pub ~/.ssh/identity.pub} { + foreach name { + ~/.ssh/id_dsa.pub ~/.ssh/id_ecdsa.pub ~/.ssh/id_ed25519.pub + ~/.ssh/id_rsa.pub ~/.ssh/identity.pub + } { if {[file exists $name]} { set fh [open $name r] set cont [read $fh] |