branch: elpa/git-commit
commit 86b8491ce87a67551e1fb4261a41f2160ded590a
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>

    magit-process-password-prompt-regexps: Match yet another prompt
    
    Also match "(user@host) Password for user@host: ".
    
    Closes #4992.
---
 lisp/magit-process.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 71498ff0a3..53df804a6b 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -167,7 +167,8 @@ itself from the hook, to avoid further futile attempts."
 (defcustom magit-process-password-prompt-regexps
   '("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
     ;; Match-group 99 is used to identify the "user@host" part.
-    "^\\(Enter \\)?[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: 
?$"
+    "^\\(Enter \\|([^) ]+) \\)?\
+[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: ?$"
     "Please enter the passphrase for the ssh key"
     "Please enter the passphrase to unlock the OpenPGP secret key"
     "^.*'s password: ?$"

Reply via email to