Merge branch 'jn/maint-gitweb-utf8-fix'

diff --git a/prompt.c b/prompt.c
index 20026444c018d0358d6dfbeecb23df3f021bc4ce..72ab9de2f94be30eef9e41ced97580f7de48e0fc 100644 (file)
--- a/prompt.c
+++ b/prompt.c
@@ -2,6 +2,7 @@
 #include "run-command.h"
 #include "strbuf.h"
 #include "prompt.h"
+#include "compat/terminal.h"
 
 static char *do_askpass(const char *cmd, const char *prompt)
 {
@@ -50,7 +51,7 @@ char *git_prompt(const char *prompt, int flags)
                        return do_askpass(askpass, prompt);
        }
 
-       r = getpass(prompt);
+       r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
        if (!r)
                die_errno("could not read '%s'", prompt);
        return r;