diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2018-03-02 15:17:35 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-03-02 15:17:35 -0800 |
| commit | 2e2f0288ef7b94f39abe694d0f0bfd0db192998c (patch) | |
| tree | 4b34762ab984fd100b14aa97d4f07a674726a8a4 /git-gui | |
| parent | Sixth batch for 2.17 (diff) | |
| parent | git-gui: search for all current SSH key types (diff) | |
| download | tgif-2e2f0288ef7b94f39abe694d0f0bfd0db192998c.tar.xz | |
Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files
* 'bb/ssh-key-files' of git-gui:
git-gui: search for all current SSH key types
Diffstat (limited to 'git-gui')
| -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] |