mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2025-01-18 10:07:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Check SSH_AUTH_SOCK to determine existence of ssh-agent

Browse source
This commit is contained in:
Tal Pressman 2022-04-25 18:30:43 +09:00 committed by Martin von Zweigbergk
parent ad79d89e4b
commit 4a1576c874
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/src/git.rs
View file

@ -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") {