summaryrefslogtreecommitdiff
path: root/ext/git/client.go
diff options
context:
space:
mode:
authorCheng Fang <cfang@redhat.com>2024-11-14 23:34:40 -0500
committerGitHub <noreply@github.com>2024-11-14 23:34:40 -0500
commit627381428eb3899596dfcb2d4f646f041c2febce (patch)
tree17ec9face79d31bbf3a51e0644e42ff088be41c7 /ext/git/client.go
parent8a156dd243811f45daad7c25fb70e10c15eede04 (diff)
chore(deps): upgrade argo-cd from 2.11.7 to 2.13.0 (#936)
Signed-off-by: Cheng Fang <cfang@redhat.com> Co-authored-by: Jann Fischer <jann@mistrust.net>
Diffstat (limited to 'ext/git/client.go')
-rw-r--r--ext/git/client.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/git/client.go b/ext/git/client.go
index 199716b..622bcf1 100644
--- a/ext/git/client.go
+++ b/ext/git/client.go
@@ -207,7 +207,7 @@ func GetRepoHTTPClient(repoURL string, insecure bool, creds Creds, proxyURL stri
},
}
- proxyFunc := proxy.GetCallback(proxyURL)
+ proxyFunc := proxy.GetCallback(proxyURL, "")
// Callback function to return any configured client certificate
// We never return err, but an empty cert instead.
@@ -802,7 +802,7 @@ func (m *nativeGitClient) runCmdOutput(cmd *exec.Cmd, ropts runOpts) (string, er
}
}
}
- cmd.Env = proxy.UpsertEnv(cmd, m.proxy)
+ cmd.Env = proxy.UpsertEnv(cmd, m.proxy, "")
opts := executil.ExecRunOpts{
TimeoutBehavior: argoexec.TimeoutBehavior{
Signal: syscall.SIGTERM,