[PATCH] Use SSH key from `GIT_SSH_KEY` variable if supplied
From: Maciej Małecki <hidden>
Date: 2016-06-15 22:53:20
Subsystem:
the rest · Maintainer:
Linus Torvalds
Using a different SSH key for various SSH commands seems to be a recurring theme. Allow user to supply path to the SSH key he wants to use for operations that require it without need to use `GIT_SSH` variable and a wrapper script. Signed-off-by: Maciej Małecki <redacted> --- connect.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/connect.c b/connect.c
index 912cdde..dd3489d 100644
--- a/connect.c
+++ b/connect.c@@ -575,8 +575,9 @@ struct child_process *git_connect(int fd[2], const char *url_orig, die("command line too long"); conn->in = conn->out = -1; - conn->argv = arg = xcalloc(7, sizeof(*arg)); + conn->argv = arg = xcalloc(9, sizeof(*arg)); if (protocol == PROTO_SSH) { + const char *key; const char *ssh = getenv("GIT_SSH"); int putty = ssh && strcasestr(ssh, "plink"); if (!ssh) ssh = "ssh";
@@ -589,6 +590,13 @@ struct child_process *git_connect(int fd[2], const char *url_orig, *arg++ = putty ? "-P" : "-p"; *arg++ = port; } + + key = getenv("GIT_SSH_KEY"); + if (key) { + *arg++ = "-i"; + *arg++ = key; + } + *arg++ = host; } else {
--
1.7.7.4