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

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Knut Franke <k.franke@xxxxxxxxxxxxxxxxxxxx> 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);
 

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


[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]