| 1 | diff --git a/Cargo.lock b/Cargo.lock
|
| 2 | index 0e3e3b8..b5e6389 100644
|
| 3 | |
| 4 | |
| 5 | @@ -1756,9 +1756,9 @@ dependencies = [
|
| 6 |
|
| 7 | [[package]]
|
| 8 | name = "git2"
|
| 9 | -version = "0.19.0"
|
| 10 | +version = "0.20.0"
|
| 11 | source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 12 | -checksum = "b903b73e45dc0c6c596f2d37eccece7c1c8bb6e4407b001096387c63d0d93724"
|
| 13 | +checksum = "3fda788993cc341f69012feba8bf45c0ba4f3291fcc08e214b4d5a7332d88aff"
|
| 14 | dependencies = [
|
| 15 | "bitflags 2.5.0",
|
| 16 | "libc",
|
| 17 | @@ -2063,9 +2063,9 @@ checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
|
| 18 |
|
| 19 | [[package]]
|
| 20 | name = "libgit2-sys"
|
| 21 | -version = "0.17.0+1.8.1"
|
| 22 | +version = "0.18.0+1.9.0"
|
| 23 | source = "registry+https://github.com/rust-lang/crates.io-index"
|
| 24 | -checksum = "10472326a8a6477c3c20a64547b0059e4b0d086869eee31e6d7da728a8eb7224"
|
| 25 | +checksum = "e1a117465e7e1597e8febea8bb0c410f1c7fb93b1e1cddf34363f8390367ffec"
|
| 26 | dependencies = [
|
| 27 | "cc",
|
| 28 | "libc",
|
| 29 | diff --git a/Cargo.toml b/Cargo.toml
|
| 30 | index b373daa..d7e087b 100644
|
| 31 | |
| 32 | |
| 33 | @@ -69,7 +69,7 @@ git-branchless-smartlog = { version = "0.10.0", path = "git-branchless-smartlog"
|
| 34 | git-branchless-submit = { version = "0.10.0", path = "git-branchless-submit" }
|
| 35 | git-branchless-test = { version = "0.10.0", path = "git-branchless-test" }
|
| 36 | git-branchless-undo = { version = "0.10.0", path = "git-branchless-undo" }
|
| 37 | -git2 = { version = "0.19.0", default-features = false }
|
| 38 | +git2 = { version = "0.20.0", default-features = false }
|
| 39 | glob = "0.3.0"
|
| 40 | indexmap = "2.2.6"
|
| 41 | indicatif = { version = "0.17.8", features = ["improved_unicode"] }
|
| 42 | This part is take from 47431f3db7479fd0bdcd92b81d2ffdb7b729ef7e
|
| 43 | diff --git a/git-branchless-invoke/src/lib.rs b/git-branchless-invoke/src/lib.rs
|
| 44 | index eee43ffaa..a6cd9738f 100644
|
| 45 | |
| 46 | |
| 47 | @@ -117,12 +117,12 @@ fn install_tracing(effects: Effects) -> eyre::Result<impl Drop> {
|
| 48 |
|
| 49 | #[instrument]
|
| 50 | fn install_libgit2_tracing() {
|
| 51 | - fn git_trace(level: git2::TraceLevel, msg: &str) {
|
| 52 | - info!("[{:?}]: {}", level, msg);
|
| 53 | + fn git_trace(level: git2::TraceLevel, msg: &[u8]) {
|
| 54 | + info!("[{:?}]: {}", level, String::from_utf8_lossy(msg));
|
| 55 | }
|
| 56 |
|
| 57 | - if !git2::trace_set(git2::TraceLevel::Trace, git_trace) {
|
| 58 | - warn!("Failed to install libgit2 tracing");
|
| 59 | + if let Err(err) = git2::trace_set(git2::TraceLevel::Trace, git_trace) {
|
| 60 | + warn!("Failed to install libgit2 tracing: {err}");
|
| 61 | }
|
| 62 | }
|
| 63 |
|