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@xxxxxxxxxxxxxxxxxxxx>
---
connect.c | 3 ++-
git.c | 3 ---
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/connect.c b/connect.c
index e296bfc..3450cab 100644
--- a/connect.c
+++ b/connect.c
@@ -629,7 +629,8 @@ char *git_getpass(const char *prompt)
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
--
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