Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't break existing GIT_SSH_COMMAND env var #453

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Don't break existing GIT_SSH_COMMAND env var #453

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions get_git.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,17 +319,20 @@ func setupGitEnv(cmd *exec.Cmd, sshKeyFile string) {
}
}

if len(sshCmd) == 0 {
sshCmd = []string{gitSSHCommand + "ssh"}
}

if sshKeyFile != "" {
// We have an SSH key temp file configured, tell ssh about this.
if runtime.GOOS == "windows" {
sshKeyFile = strings.Replace(sshKeyFile, `\`, `/`, -1)
}

if len(sshCmd) == 0 {
sshCmd = []string{gitSSHCommand + "ssh"}
}

sshCmd = append(sshCmd, "-i", sshKeyFile)
env = append(env, strings.Join(sshCmd, " "))
} else if len(sshCmd) > 0 {
env = append(env, strings.Join(sshCmd, " "))
}

cmd.Env = env
Expand Down
23 changes: 23 additions & 0 deletions get_git_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,6 +699,29 @@ func TestGitGetter_setupGitEnvWithExisting_sshKey(t *testing.T) {
}
}

func TestGitGetter_setupGitEnvWithExisting_noSSHKey(t *testing.T) {
if runtime.GOOS == "windows" {
t.Skipf("skipping on windows since the test requires sh")
return
}

// start with an existing ssh command configuration
os.Setenv("GIT_SSH_COMMAND", "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes")
defer os.Setenv("GIT_SSH_COMMAND", "")

cmd := exec.Command("/bin/sh", "-c", "echo $GIT_SSH_COMMAND")
setupGitEnv(cmd, "")
out, err := cmd.Output()
if err != nil {
t.Fatal(err)
}

actual := strings.TrimSpace(string(out))
if actual != "ssh -o StrictHostKeyChecking=no -o IdentitiesOnly=yes" {
t.Fatalf("unexpected GIT_SSH_COMMAND: %q", actual)
}
}

func TestGitGetter_subdirectory_symlink(t *testing.T) {
if !testHasGit {
t.Skip("git not found, skipping")
Expand Down