git2 upgrade (#2473)

extrawurst · web-flow · commit 01ad0615b23b · 2025-01-10T15:28:52.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/asyncgit/Cargo.toml b/asyncgit/Cargo.toml
@@ -17,7 +17,7 @@ crossbeam-channel = "0.5"
 dirs = "5.0"
 easy-cast = "0.5"
 fuzzy-matcher = "0.3"
-git2 = "0.19"
+git2 = "0.20"
 git2-hooks = { path = "../git2-hooks", version = ">=0.4" }
 gix = { version = "0.69.1", default-features = false, features = [
     "max-performance",
diff --git a/asyncgit/src/lib.rs b/asyncgit/src/lib.rs
@@ -129,10 +129,10 @@ pub fn hash<T: Hash + ?Sized>(v: &T) -> u64 {
 ///
 #[cfg(feature = "trace-libgit")]
 pub fn register_tracing_logging() -> bool {
-	fn git_trace(level: git2::TraceLevel, msg: &str) {
-		log::info!("[{:?}]: {}", level, msg);
+	fn git_trace(level: git2::TraceLevel, msg: &[u8]) {
+		log::info!("[{:?}]: {}", level, String::from_utf8_lossy(msg));
 	}
-	git2::trace_set(git2::TraceLevel::Trace, git_trace)
+	git2::trace_set(git2::TraceLevel::Trace, git_trace).is_ok()
 }
 
 ///

Original file line number	Diff line number	Diff line change
`@@ -129,10 +129,10 @@ pub fn hash<T: Hash + ?Sized>(v: &T) -> u64 {`
`129`	`129`	`///`
`130`	`130`	`#[cfg(feature = "trace-libgit")]`
`131`	`131`	`pub fn register_tracing_logging() -> bool {`
`132`		`- fn git_trace(level: git2::TraceLevel, msg: &str) {`
`133`		`- log::info!("[{:?}]: {}", level, msg);`
	`132`	`+ fn git_trace(level: git2::TraceLevel, msg: &[u8]) {`
	`133`	`+ log::info!("[{:?}]: {}", level, String::from_utf8_lossy(msg));`
`134`	`134`	`}`
`135`		`- git2::trace_set(git2::TraceLevel::Trace, git_trace)`
	`135`	`+ git2::trace_set(git2::TraceLevel::Trace, git_trace).is_ok()`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`///`