summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@edwardthomson.com>2023-02-22 23:58:57 +0000
committerGitHub <noreply@github.com>2023-02-22 23:58:57 +0000
commitc9387a61656cd666d76a0491f6839c1a32835ca0 (patch)
treea4a4f742d3e412ac5fa1b92b698c6749388cb423
parent11579d591e4601f941b20463ea5ac5b68414c47c (diff)
parentd286952f9e8fce847404f2651e4e341dd33e96eb (diff)
downloadlibgit2-c9387a61656cd666d76a0491f6839c1a32835ca0.tar.gz
Merge pull request #6497 from fxcoudert/ssh-agent-nonfatal
Make failure to connect to ssh-agent non-fatal
-rw-r--r--src/libgit2/transports/ssh.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libgit2/transports/ssh.c b/src/libgit2/transports/ssh.c
index e90ab07e8..60d26e802 100644
--- a/src/libgit2/transports/ssh.c
+++ b/src/libgit2/transports/ssh.c
@@ -246,8 +246,10 @@ static int ssh_agent_auth(LIBSSH2_SESSION *session, git_credential_ssh_key *c) {
rc = libssh2_agent_connect(agent);
- if (rc != LIBSSH2_ERROR_NONE)
+ if (rc != LIBSSH2_ERROR_NONE) {
+ rc = LIBSSH2_ERROR_AUTHENTICATION_FAILED;
goto shutdown;
+ }
rc = libssh2_agent_list_identities(agent);