Junio C Hamano <gitster@xxxxxxxxx> writes:
> ... So an alternative route
> may be to keep git_getpass() as-is, and update the init_curl_http_auth()
> callsite to include the username (but imap-send assumes that user and host
> are relatively short without verifying that assumption, and should not be
> used as a model of good existing code).
And here is such a lazy patch, completely untested, of course ;-).
http.c | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/http.c b/http.c
index b2ae8de..44948a7 100644
--- a/http.c
+++ b/http.c
@@ -209,8 +209,11 @@ static void init_curl_http_auth(CURL *result)
{
if (user_name) {
struct strbuf up = STRBUF_INIT;
- if (!user_pass)
- user_pass = xstrdup(git_getpass("Password: "));
+ if (!user_pass) {
+ strbuf_addf(&up, "Password for %s: ", user_name);
+ user_pass = xstrdup(git_getpass(up.buf));
+ strbuf_reset(&up);
+ }
strbuf_addf(&up, "%s:%s", user_name, user_pass);
curl_easy_setopt(result, CURLOPT_USERPWD,
strbuf_detach(&up, NULL));
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html