git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: git@vger.kernel.org
Subject: [PATCH 4/6] prompt: add PROMPT_ECHO flag
Date: Sun, 27 Nov 2011 03:30:26 -0500	[thread overview]
Message-ID: <20111127083025.GD1702@sigill.intra.peff.net> (raw)
In-Reply-To: <20111127082744.GA32068@sigill.intra.peff.net>

This will use getpass_echo when set.

Signed-off-by: Jeff King <peff@peff.net>
---
 prompt.c |    5 ++++-
 prompt.h |    1 +
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/prompt.c b/prompt.c
index 7c8f9aa..c46227f 100644
--- a/prompt.c
+++ b/prompt.c
@@ -2,6 +2,7 @@
 #include "run-command.h"
 #include "strbuf.h"
 #include "prompt.h"
+#include "compat/getpass.h"
 
 static char *do_askpass(const char *cmd, const char *prompt, const char *name)
 {
@@ -48,7 +49,9 @@
 			return do_askpass(askpass, prompt, name);
 	}
 
-	return getpass(prompt);
+	return flags & PROMPT_ECHO ?
+		getpass_echo(prompt) :
+		getpass(prompt);
 }
 
 char *git_getpass(const char *prompt)
diff --git a/prompt.h b/prompt.h
index 18868c2..7201cae 100644
--- a/prompt.h
+++ b/prompt.h
@@ -2,6 +2,7 @@
 #define PROMPT_H
 
 #define PROMPT_ASKPASS (1<<0)
+#define PROMPT_ECHO    (1<<1)
 
 char *git_prompt(const char *prompt, const char *name, int flags);
 char *git_getpass(const char *prompt);
-- 
1.7.7.4.7.g24824

  parent reply	other threads:[~2011-11-27  8:30 UTC|newest]

Thread overview: 49+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-11-24 10:58 [PATCH 0/13] credential helpers, take two Jeff King
2011-11-24 10:58 ` [PATCH 01/13] test-lib: add test_config_global variant Jeff King
2011-11-24 10:59 ` [PATCH 02/13] t5550: fix typo Jeff King
2011-11-24 11:01 ` [PATCH 03/13] introduce credentials API Jeff King
2011-11-28 21:46   ` Junio C Hamano
2011-11-29  5:04     ` Jeff King
2011-11-29 17:34       ` Junio C Hamano
2011-11-29 21:14         ` Jeff King
2011-11-24 11:01 ` [PATCH 04/13] credential: add function for parsing url components Jeff King
2011-11-24 11:01 ` [PATCH 05/13] http: use credential API to get passwords Jeff King
2011-11-24 11:02 ` [PATCH 06/13] credential: apply helper config Jeff King
2011-11-24 11:02 ` [PATCH 07/13] credential: add credential.*.username Jeff King
2011-11-24 11:03 ` [PATCH 08/13] credential: make relevance of http path configurable Jeff King
2011-11-24 11:05 ` [PATCH 09/13] docs: end-user documentation for the credential subsystem Jeff King
2011-11-24 11:07 ` [PATCH 10/13] credentials: add "cache" helper Jeff King
2011-11-24 14:36   ` Eric Sunshine
2011-11-29  0:42   ` Junio C Hamano
2011-11-29  5:04     ` Jeff King
2011-11-24 11:07 ` [PATCH 11/13] strbuf: add strbuf_add*_urlencode Jeff King
2011-11-29 18:19   ` Junio C Hamano
2011-11-29 21:19     ` Jeff King
2011-11-29 23:26       ` René Scharfe
2011-11-30  3:20         ` Jeff King
2011-11-30  5:40           ` Junio C Hamano
2011-11-30  5:41           ` René Scharfe
2011-11-24 11:07 ` [PATCH 12/13] credentials: add "store" helper Jeff King
2011-11-24 14:29   ` Eric Sunshine
2011-11-24 20:09     ` Jeff King
2011-11-29 18:19   ` Junio C Hamano
2011-11-29 21:38     ` Jeff King
2011-11-24 11:09 ` [PATCH 13/13] t: add test harness for external credential helpers Jeff King
2011-11-24 11:45 ` [PATCH 0/13] credential helpers, take two Erik Faye-Lund
2011-11-24 11:53   ` Jeff King
2011-11-24 12:08     ` Erik Faye-Lund
2011-11-27  8:27 ` [PATCH 0/6] echo usernames as they are typed Jeff King
2011-11-27  8:28   ` [PATCH 1/6] move git_getpass to its own source file Jeff King
2011-11-27  8:29   ` [PATCH 2/6] refactor git_getpass into generic prompt function Jeff King
2011-11-27  8:30   ` [PATCH 3/6] stub out getpass_echo function Jeff King
2011-11-27  8:30   ` Jeff King [this message]
2011-11-27  8:31   ` [PATCH 5/6] credential: use git_prompt instead of git_getpass Jeff King
2011-11-27  8:31   ` [PATCH 6/6] compat/getpass: add a /dev/tty implementation Jeff King
2011-11-27  8:56   ` [PATCH 0/6] echo usernames as they are typed Junio C Hamano
2011-11-27  9:17   ` Erik Faye-Lund
2011-11-28  3:53     ` Jeff King
2011-11-28  9:36       ` Erik Faye-Lund
2011-11-28 11:31         ` Jeff King
2011-11-28 11:49           ` Frans Klaver
2011-11-28 12:59           ` Erik Faye-Lund
2011-11-28 18:59             ` Jeff King

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20111127083025.GD1702@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).