From 4a1576c87491ba732220dd783fb01c2cf075e8d4 Mon Sep 17 00:00:00 2001 From: Tal Pressman Date: Mon, 25 Apr 2022 18:30:43 +0900 Subject: [PATCH] Check SSH_AUTH_SOCK to determine existence of ssh-agent --- lib/src/git.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/git.rs b/lib/src/git.rs index 8e41b9654..0403dc7a6 100644 --- a/lib/src/git.rs +++ b/lib/src/git.rs @@ -436,7 +436,7 @@ fn create_remote_callbacks() -> RemoteCallbacks<'static> { // crate shouldn't look in $HOME etc. callbacks.credentials(|_url, username_from_url, allowed_types| { if allowed_types.contains(git2::CredentialType::SSH_KEY) { - if std::env::var("SSH_AGENT_PID").is_ok() { + if std::env::var("SSH_AUTH_SOCK").is_ok() || std::env::var("SSH_AGENT_PID").is_ok() { return git2::Cred::ssh_key_from_agent(username_from_url.unwrap()); } if let Ok(home_dir) = std::env::var("HOME") {