[PATCH 2/2] Allow core.askpass to override SSH_ASKPASS.

[PATCH 2/2] Allow core.askpass to override SSH_ASKPASS.

[Knut Franke]

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 

Re: [PATCH 2/2] Allow core.askpass to override SSH_ASKPASS.

[Erik Faye-Lund]

On Fri, Aug 27, 2010 at 12:51 PM, Knut Franke
<k.franke@science-computing.de> wrote:
> From: Knut Franke <k.franke@science-computing.de>
>

You don't need this line unless you're forwarding a patch for someone
else (or using a different e-mail account).

> Modify handling of the 'core.askpass' option so that it has the same effect as
> GIT_ASKPASS also if SSH_ASKPASS is set.
>

Why are you sending a two-patch series where the second patch tries to
correct the first one? Wouldn't it make more sense to squash the two?

> 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");
> +

Why?

Apart from these nits, I think the patch does the right thing. IMO it
doesn't make sense for SSH_ASKPASS to trump core.askpass.

Re: [PATCH 2/2] Allow core.askpass to override SSH_ASKPASS.

[Knut Franke]

On Friday 27 August 2010 14:00:16 Erik Faye-Lund wrote:
> > From: Knut Franke <k.franke@science-computing.de>
>
> You don't need this line unless you're forwarding a patch for someone
> else (or using a different e-mail account).

ACK.

> > Modify handling of the 'core.askpass' option so that it has the same
> > effect as GIT_ASKPASS also if SSH_ASKPASS is set.
>
> Why are you sending a two-patch series where the second patch tries to
> correct the first one? Wouldn't it make more sense to squash the two?

a) The author of the first patch is on holiday, and I didn't want to pass off 
his work as mine nor my mistakes as his. ;-)

b) Maybe not everyone agrees about the correct order of precedence.

> > 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");
> > +
>
> Why?

Considering the check for SSH_ASKPASS added below, I believe this improves 
legibilty since all of the "if (!askpass..." blocks are similar in intention.

-- 
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 

Re: [PATCH 2/2] Allow core.askpass to override SSH_ASKPASS.

[Junio C Hamano]

Knut Franke <k.franke@science-computing.de> writes:

>> > 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");
>> > +
>>
>> Why?
>
> Considering the check for SSH_ASKPASS added below, I believe this improves 
> legibilty since all of the "if (!askpass..." blocks are similar in intention.

I think Erik is asking about the extra blank line.  You could have
achieved the same consistency by removing, no?

diff --git a/connect.c b/connect.c
index e296bfc..f97b84c 100644
--- a/connect.c
+++ b/connect.c
@@ -627,9 +627,10 @@ 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);