Skip to content

Commit

Permalink
Merge branch 'bb/git-gui-ssh-key-files'
Browse files Browse the repository at this point in the history
"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
  • Loading branch information
gitster committed Apr 25, 2018
2 parents fe0a9ea + 2e2f028 commit 8b09611
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion git-gui/lib/sshkey.tcl
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down

0 comments on commit 8b09611

Please sign in to comment.