Merge pull request #6497 from fxcoudert/ssh-agent-nonfatal

Make failure to connect to ssh-agent non-fatal

Merge pull request #6497 from fxcoudert/ssh-agent-nonfatal
Make failure to connect to ssh-agent non-fatal
c9387a61 · Edward Thomson · GitHub · 11579d59 · d286952f · c9387a61
Unverified Commit c9387a61 authored Feb 22, 2023 by Edward Thomson Committed by GitHub Feb 22, 2023
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletions

src/libgit2/transports/ssh.c
+3 -1

No files found.
--- 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);