summaryrefslogtreecommitdiff
path: root/http.c
diff options
context:
space:
mode:
authorFrank Li <lznuaa@gmail.com>2010-03-04 20:59:50 +0100
committerJunio C Hamano <gitster@pobox.com>2010-03-04 22:05:13 -0800
commitf206063b4b201ff48c87b886cbe21a068fcf6d49 (patch)
treeb26d68a8e97744309a87e381a80f87607a354db3 /http.c
parent56a853b62c0ae7ebaad0a7a0a704f5ef561eb795 (diff)
downloadgit-f206063b4b201ff48c87b886cbe21a068fcf6d49.tar.gz
git-core: Support retrieving passwords with GIT_ASKPASS
git tries to read a password from the terminal in imap-send and when talking to a http server that requires authentication. When a GUI is driving git, however, the end user is not paying attention to the terminal (there may not even be a terminal). GUI would appear to hang forever. Fix this problem by allowing a password-retrieving command to be specified in GIT_ASKPASS Signed-off-by: Frank Li <lznuaa@gmail.com> Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'http.c')
-rw-r--r--http.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/http.c b/http.c
index deab59551d..4814217c64 100644
--- a/http.c
+++ b/http.c
@@ -204,7 +204,7 @@ static void init_curl_http_auth(CURL *result)
if (user_name) {
struct strbuf up = STRBUF_INIT;
if (!user_pass)
- user_pass = xstrdup(getpass("Password: "));
+ user_pass = xstrdup(git_getpass("Password: "));
strbuf_addf(&up, "%s:%s", user_name, user_pass);
curl_easy_setopt(result, CURLOPT_USERPWD,
strbuf_detach(&up, NULL));
@@ -219,7 +219,7 @@ static int has_cert_password(void)
return 0;
/* Only prompt the user once. */
ssl_cert_password_required = -1;
- ssl_cert_password = getpass("Certificate Password: ");
+ ssl_cert_password = git_getpass("Certificate Password: ");
if (ssl_cert_password != NULL) {
ssl_cert_password = xstrdup(ssl_cert_password);
return 1;