From: Knut Franke <k.franke@science-computing•de>
To: git@vger•kernel.org
Cc: Frank Li <lznuaa@gmail•com>
Subject: [PATCH 2/2] Allow core.askpass to override SSH_ASKPASS.
Date: Fri, 27 Aug 2010 12:51:21 +0200 [thread overview]
Message-ID: <201008271251.23136.k.franke@science-computing.de> (raw)
From: Knut Franke <k.franke@science-computing•de>
Modify handling of the 'core.askpass' option so that it has the same effect as
GIT_ASKPASS also if SSH_ASKPASS is set.
Signed-off-by: Knut Franke <k.franke@science-computing•de>
---
I'd say this precedence order is more intuitive; and more useful.
connect.c | 4 ++++
git.c | 3 ---
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/connect.c b/connect.c
index e296bfc..f97b84c 100644
--- a/connect.c
+++ b/connect.c
@@ -627,9 +627,13 @@ char *git_getpass(const char *prompt)
static struct strbuf buffer = STRBUF_INIT;
askpass = getenv("GIT_ASKPASS");
+
if (!askpass)
askpass = askpass_program;
+ if (!askpass)
+ askpass = getenv("SSH_ASKPASS");
+
if (!askpass || !(*askpass))
return getpass(prompt);
diff --git a/git.c b/git.c
index 12d2952..1545257 100644
--- a/git.c
+++ b/git.c
@@ -55,9 +55,6 @@ static int handle_options(const char ***argv, int *argc, int
*envchanged)
{
int handled = 0;
- if (!getenv("GIT_ASKPASS") && getenv("SSH_ASKPASS"))
- setenv("GIT_ASKPASS", getenv("SSH_ASKPASS"), 1);
-
while (*argc > 0) {
const char *cmd = (*argv)[0];
if (cmd[0] != '-')
--
1.7.2.1
--
Vorstand/Board of Management:
Dr. Bernd Finkbeiner, Dr. Roland Niemeier,
Dr. Arno Steitz, Dr. Ingrid Zech
Vorsitzender des Aufsichtsrats/
Chairman of the Supervisory Board:
Michel Lepert
Sitz/Registered Office: Tuebingen
Registergericht/Registration Court: Stuttgart
Registernummer/Commercial Register No.: HRB 382196
next reply other threads:[~2010-08-27 11:07 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-27 10:51 Knut Franke [this message]
2010-08-27 12:00 ` [PATCH 2/2] Allow core.askpass to override SSH_ASKPASS Erik Faye-Lund
2010-08-27 12:45 ` Knut Franke
2010-08-27 17:28 ` Junio C Hamano
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=201008271251.23136.k.franke@science-computing.de \
--to=k.franke@science-computing$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
--cc=lznuaa@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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