Merge branch 'bb/ssh-key-files' of git-gui into bb/git-gui-ssh-key-files

gitster · gitster · commit 2e2f0288ef7b · 2018-03-02T15:17:35.000-08:00
* 'bb/ssh-key-files' of git-gui:
  git-gui: search for all current SSH key types
diff --git 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]
