diff options
| author | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:02:01 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-08-28 23:02:01 -0700 |
| commit | 10d781b9caa4f71495c7b34963bef137216f86a8 (patch) | |
| tree | eec73f3aec2ea1255bb3e131bd54e0a04e64d0f2 /connect.c | |
| parent | 928f74de22536129b696218073a3940ae4ab1199 (diff) | |
| parent | fb2af0375bcef9f5f5cbb1f4dc9f81459ce1f4b1 (diff) | |
| download | git-10d781b9caa4f71495c7b34963bef137216f86a8.tar.gz git-10d781b9caa4f71495c7b34963bef137216f86a8.tar.xz | |
Merge refs/heads/portable from http://www.cs.berkeley.edu/~ejr/gits/git.git
Diffstat (limited to 'connect.c')
| -rw-r--r-- | connect.c | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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 |