From dedc0776f3d0f7bfb711d4e9fe0a00391bd1efb7 Mon Sep 17 00:00:00 2001 From: Kyle Carberry Date: Fri, 15 Apr 2022 20:00:15 +0000 Subject: [PATCH] fix: Remove quotes on GitSSH This was a bug @f0ssel found that was breaking gitssh. --- agent/agent.go | 2 +- agent/agent_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/agent.go b/agent/agent.go index 81eeb1e850012..1ad4f7fd6ad91 100644 --- a/agent/agent.go +++ b/agent/agent.go @@ -237,7 +237,7 @@ func (a *agent) handleSSHSession(session ssh.Session) error { if err != nil { return xerrors.Errorf("getting os executable: %w", err) } - cmd.Env = append(cmd.Env, fmt.Sprintf(`GIT_SSH_COMMAND="%s gitssh --"`, executablePath)) + cmd.Env = append(cmd.Env, fmt.Sprintf(`GIT_SSH_COMMAND=%s gitssh --`, executablePath)) sshPty, windowSize, isPty := session.Pty() if isPty { diff --git a/agent/agent_test.go b/agent/agent_test.go index d195d6580c081..5fad6435da061 100644 --- a/agent/agent_test.go +++ b/agent/agent_test.go @@ -57,7 +57,7 @@ func TestAgent(t *testing.T) { } output, err := session.Output(command) require.NoError(t, err) - require.Contains(t, string(output), "gitssh --") + require.True(t, strings.HasSuffix(strings.TrimSpace(string(output)), "gitssh --")) }) t.Run("SessionTTY", func(t *testing.T) {