Previously we were asking only when there was a passphrase for ssh key.
---
 magit.el |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/magit.el b/magit.el
index 801a303..608cbc0 100644
--- a/magit.el
+++ b/magit.el
@@ -1289,14 +1289,13 @@ FUNC should leave point at the end of the modified 
region"
 
 (defun magit-password (proc string)
   "Checks if git/ssh asks for a password and ask the user for it."
-  (when (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
+  (when (or (string-match "^Enter passphrase for key '\\\(.*\\\)': $" string)
+           (string-match "^\\\(.*\\\)'s password:" string))
     (process-send-string proc
                          (concat (read-passwd
                                   (format "Password for '%s': " (match-string 
1 string))
                                   nil) "\n"))))
 
-
-
 (defun magit-process-filter (proc string)
   (save-current-buffer
     (set-buffer (process-buffer proc))
-- 
1.7.1

Reply via email to