undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

prompt: use git_terminal_prompt

Browse Source 
Our custom implementation of git_terminal_prompt has many
advantages over regular getpass(), as described in the prior
commit.

This also lets us implement a PROMPT_ECHO flag for callers
who want it.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2011-12-10 05:41:08 -05:00 committed by Junio C Hamano
parent 21aeafceda
commit a50902590e
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
prompt.c
View File

@ -2,6 +2,7 @@
#include "run-command.h" #include "run-command.h"
#include "strbuf.h" #include "strbuf.h"
#include "prompt.h" #include "prompt.h"
#include "compat/terminal.h"
static char *do_askpass(const char *cmd, const char *prompt) 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); return do_askpass(askpass, prompt);
} }
r = getpass(prompt); r = git_terminal_prompt(prompt, flags & PROMPT_ECHO);
if (!r) if (!r)
die_errno("could not read '%s'", prompt); die_errno("could not read '%s'", prompt);
return r; return r;

1
prompt.h
View File

@ -2,6 +2,7 @@
#define PROMPT_H #define PROMPT_H
#define PROMPT_ASKPASS (1<<0) #define PROMPT_ASKPASS (1<<0)
#define PROMPT_ECHO (1<<1)
char *git_prompt(const char *prompt, int flags); char *git_prompt(const char *prompt, int flags);
char *git_getpass(const char *prompt); char *git_getpass(const char *prompt);