branch: elpa/magit
commit 4e4690968a6239746fc8e5f97140e40f48d1bd58
Author: Jonas Bernoulli <[email protected]>
Commit: Jonas Bernoulli <[email protected]>
magit-process-password-prompt-regexps: Split out a host regexp
OpenSSH may use prompts like "(user@host) Password for user@host: ".
Let's treat that separately to avoid obfuscating the regexp used for
less repetitive host prompts.
---
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 467311dbc54..55570e8949a 100644
--- a/lisp/magit-process.el
+++ b/lisp/magit-process.el
@@ -161,8 +161,9 @@ itself from the hook, to avoid further futile attempts."
'(;; * CLI-prompt for passphrase for key:
"^\\(Enter \\)?[Pp]assphrase\\( for \\(RSA \\)?key '.*'\\)?: ?$"
;; * Password for [user@]host (which we put in match group 99):
- "^\\(Enter \\|([^) ]+) \\)?[Pp]assword\\( for \
+ "^\\(Enter \\)?[Pp]assword\\( for \
[\"']?\\(https?://\\)?\\(?99:[^\"']+\\)[\"']?\\)?: ?$"
+ "^(\\(?1:[^) ]+\\)) Password for \\(?99:\\1\\): ?$" ;#4992
"^\\(?99:[^']+\\)\\('s\\)? password: ?$"
;; * Token for git-credential-manager-core (#4318):
"^Token: $"