Merge branch 'master' into struct-patch-upgrade-fix

asyncgit/Cargo.toml

@@ -32,7 +32,7 @@ rayon = "1.10"
 rayon-core = "1.12"
 scopetime = { path = "../scopetime", version = "0.1" }
 serde = { version = "1.0", features = ["derive"] }
-ssh-key = { version = "0.6.6", features = ["crypto", "encryption"] }
+ssh-key = { version = "0.6.7", features = ["crypto", "encryption"] }
 thiserror = "1.0"
 unicode-truncate = "1.0"
 url = "2.5"

asyncgit/src/revlog.rs

@@ -331,6 +331,8 @@ mod tests {
  use std::time::Duration;
 
  use crossbeam_channel::unbounded;
+ use serial_test::serial;
+ use tempfile::TempDir;
 
  use crate::sync::tests::{debug_cmd_print, repo_init};
  use crate::sync::RepoPath;
@@ -368,4 +370,37 @@ mod tests {
 
  assert!(result.is_ok());
  }
+
+ #[test]
+ #[serial]
+ fn test_env_variables() {
+ let (_td, repo) = repo_init().unwrap();
+ let git_dir = repo.path();
+
+ let (tx_git, _rx_git) = unbounded();
+
+ let empty_dir = TempDir::new().unwrap();
+ let empty_path: RepoPath =
+ empty_dir.path().to_str().unwrap().into();
+
+ let arc_current = Arc::new(Mutex::new(AsyncLogResult {
+ commits: Vec::new(),
+ duration: Duration::default(),
+ }));
+ let arc_background = Arc::new(AtomicBool::new(false));
+
+ std::env::set_var("GIT_DIR", git_dir);
+
+ let result = AsyncLog::fetch_helper_without_filter(
+ // We pass an empty path, thus testing whether `GIT_DIR`, set above, is taken into account.
+ &empty_path,
+ &arc_current,
+ &arc_background,
+ &tx_git,
+ );
+
+ std::env::remove_var("GIT_DIR");
+
+ assert!(result.is_ok());
+ }
 }