Merge remote-tracking branch 'upstream/master'

Author: andrea-berling

CHANGELOG.md

@@ -7,6 +7,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+### Fixes
+* respect env vars like `GIT_CONFIG_GLOBAL` ([#2298](https://github.com/extrawurst/gitui/issues/2298))
+
 ## [0.26.3] - 2024-06-02
 
 ### Breaking Changes

Cargo.lock

@@ -19,7 +19,7 @@ easy-cast = "0.5"
 fuzzy-matcher = "0.3"
 git2 = "0.19"
 git2-hooks = { path = "../git2-hooks", version = "0.3" }
-gix = { version = "0.63", default-features = false, features = ["max-performance", "revision"] }
+gix = { version = "0.64", default-features = false, features = ["max-performance", "revision"] }
 log = "0.4"
 # git2 = { path = "../../extern/git2-rs", features = ["vendored-openssl"]}
 # git2 = { git="https://github.com/extrawurst/git2-rs.git", rev="fc13dcc", features = ["vendored-openssl"]}

asyncgit/Cargo.toml

@@ -92,7 +92,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 	}
 
 	/// makes sure `next` is cleared and returns `true` if it actually canceled something
-	pub fn cancel(&mut self) -> bool {
+	pub fn cancel(&self) -> bool {
 		if let Ok(mut next) = self.next.lock() {
 			if next.is_some() {
 				*next = None;
@@ -111,7 +111,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 	/// spawns `task` if nothing is running currently,
 	/// otherwise schedules as `next` overwriting if `next` was set before.
 	/// return `true` if the new task gets started right away.
-	pub fn spawn(&mut self, task: J) -> bool {
+	pub fn spawn(&self, task: J) -> bool {
 		self.schedule_next(task);
 		self.check_for_job()
 	}
@@ -162,7 +162,7 @@ impl<J: 'static + AsyncJob> AsyncSingleJob<J> {
 		Ok(())
 	}
 
-	fn schedule_next(&mut self, task: J) {
+	fn schedule_next(&self, task: J) {
 		if let Ok(mut next) = self.next.lock() {
 			*next = Some(task);
 		}
@@ -226,7 +226,7 @@ mod test {
 	fn test_overwrite() {
 		let (sender, receiver) = unbounded();
 
-		let mut job: AsyncSingleJob<TestJob> =
+		let job: AsyncSingleJob<TestJob> =
 			AsyncSingleJob::new(sender);
 
 		let task = TestJob {
@@ -265,7 +265,7 @@ mod test {
 	fn test_cancel() {
 		let (sender, receiver) = unbounded();
 
-		let mut job: AsyncSingleJob<TestJob> =
+		let job: AsyncSingleJob<TestJob> =
 			AsyncSingleJob::new(sender);
 
 		let task = TestJob {