branch: elpa/magit
commit 8a6ca692fea144521db856d4b096cc5d875863cb
Author: Jonas Bernoulli <jo...@bernoul.li>
Commit: Jonas Bernoulli <jo...@bernoul.li>

    magit-process-password-prompt-regexps: Add another user@host lookup
    
    Add another entry that always prompts, because the modified entry may
    stop matching some prompts (containing an unusual quote).  Also tweak
    another entry.
    
    Fixes #5257.
---
 lisp/magit-process.el | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/lisp/magit-process.el b/lisp/magit-process.el
index 317f14d81f9..953086b929e 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -169,10 +169,11 @@ itself from the hook, to avoid further futile attempts."
   '("^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
     ;; Match-group 99 is used to identify the "user@host" part.
     "^\\(Enter \\|([^) ]+) \\)?\
-[Pp]assword\\( for '?\\(https?://\\)?\\(?99:[^']*\\)'?\\)?: ?$"
+[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: ?$"
+    "^\\(?99:[^']+\\)\\('s\\)? password: ?$"
+    "^.+ password: ?$"
     "^Token: $" ; For git-credential-manager-core (#4318).
     "^Yubikey for .*: ?$"
     "^Enter PIN for .*: ?$")

Reply via email to