From: Frank Li <lznuaa@gmail.com>
Date: Tue, 2 Mar 2010 11:52:11 +0000 (+0800)
Subject: fallback SSH_ASKPASS when GIT_ASKPASS not set
X-Git-Tag: v1.7.1-rc0~126
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=82cd8358e8203fa02da18e8ee71449cb45c4157d;p=git.git

fallback SSH_ASKPASS when GIT_ASKPASS not set

If GIT_ASKPASS is not set and SSH_ASKPASS set, GIT_ASKPASS will
use SSH_ASKPASS.

Signed-off-by: Frank Li <lznuaa@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/git.c b/git.c
index 90c6daf15..f09948eed 100644
--- a/git.c
+++ b/git.c
@@ -54,6 +54,9 @@ 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] != '-')