diff --git a/src/main.rs b/src/main.rs index f958050..4a2c76a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -40,9 +40,9 @@ async fn main() -> eyre::Result<()> { ); let mut cb = RemoteCallbacks::new(); - cb.credentials(|_, _, _| { + cb.credentials(|_, username, _| { if let Some(sock) = std::env::var("SSH_AUTH_SOCK").ok() { - return Cred::ssh_key_from_agent("git"); + return Cred::ssh_key_from_agent(username.unwrap_or("git")); } let username = std::env::var("GIT_USERNAME").expect("GIT_USERNAME to be set"); let password = std::env::var("GIT_PASSWORD").expect("GIT_PASSWORD to be set"); @@ -118,9 +118,9 @@ async fn main() -> eyre::Result<()> { let mut remote = repo.find_remote("origin")?; let mut cb = RemoteCallbacks::new(); - cb.credentials(|_, _, _| { + cb.credentials(|_, username, _| { if let Some(sock) = std::env::var("SSH_AUTH_SOCK").ok() { - return Cred::ssh_key_from_agent("git"); + return Cred::ssh_key_from_agent(username.unwrap_or("git")); } let username = std::env::var("GIT_USERNAME").expect("GIT_USERNAME to be set"); let password = std::env::var("GIT_PASSWORD").expect("GIT_PASSWORD to be set");