Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git

[git.git] / connect.c

diff --git a/connect.c b/connect.c
index 7cd5873..825c439 100644 (file)
--- a/connect.c
+++ b/connect.c
@@ -396,8 +396,10 @@ int git_connect(int fd[2], char *url, const char *prog)
                close(pipefd[1][0]);
                close(pipefd[1][1]);
                if (protocol == PROTO_SSH) {
-                       const char *ssh = getenv("GIT_SSH") ? : "ssh";
-                       const char *ssh_basename = strrchr(ssh, '/');
+                       const char *ssh, *ssh_basename;
+                       ssh = getenv("GIT_SSH");
+                       if (!ssh) ssh = "ssh";
+                       ssh_basename = strrchr(ssh, '/');
                        if (!ssh_basename)
                                ssh_basename = ssh;
                        else