diff options
| author | Jeff King <peff@peff.net> | 2011-12-10 05:41:23 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-12-12 16:09:39 -0800 |
| commit | ce77aa4813c8a3980283c0a1e760f51f3a405154 (patch) | |
| tree | 96568c1061bcc651bcd7a6a03f281b2cca72882e | |
| parent | a50902590e703878e888fd8a33ec5a22d5347481 (diff) | |
| download | git-ce77aa4813c8a3980283c0a1e760f51f3a405154.tar.gz | |
credential: use git_prompt instead of git_getpass
We use git_getpass to retrieve the username and password
from the terminal. However, git_getpass will not echo the
username as the user types. We can fix this by using the
more generic git_prompt, which underlies git_getpass but
lets us specify an "echo" option.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | credential.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/credential.c b/credential.c index fbb72311be..62d1c56819 100644 --- a/credential.c +++ b/credential.c @@ -109,7 +109,8 @@ static void credential_describe(struct credential *c, struct strbuf *out) strbuf_addf(out, "/%s", c->path); } -static char *credential_ask_one(const char *what, struct credential *c) +static char *credential_ask_one(const char *what, struct credential *c, + int flags) { struct strbuf desc = STRBUF_INIT; struct strbuf prompt = STRBUF_INIT; @@ -121,11 +122,7 @@ static char *credential_ask_one(const char *what, struct credential *c) else strbuf_addf(&prompt, "%s: ", what); - /* FIXME: for usernames, we should do something less magical that - * actually echoes the characters. However, we need to read from - * /dev/tty and not stdio, which is not portable (but getpass will do - * it for us). http.c uses the same workaround. */ - r = git_getpass(prompt.buf); + r = git_prompt(prompt.buf, flags); strbuf_release(&desc); strbuf_release(&prompt); @@ -135,9 +132,11 @@ static char *credential_ask_one(const char *what, struct credential *c) static void credential_getpass(struct credential *c) { if (!c->username) - c->username = credential_ask_one("Username", c); + c->username = credential_ask_one("Username", c, + PROMPT_ASKPASS|PROMPT_ECHO); if (!c->password) - c->password = credential_ask_one("Password", c); + c->password = credential_ask_one("Password", c, + PROMPT_ASKPASS); } int credential_read(struct credential *c, FILE *fp) |