From 2418da33a8d848dfdb85b58a1e27f2c1b616df3d Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Wed, 9 Oct 2024 23:50:16 -0600 Subject: [PATCH] fix: trace showing at inappropriate level This fix is temporary while I investigate upstream: https://github.com/Byron/gitoxide/issues/1615 --- Cargo.lock | 2 +- gix-credentials/Cargo.toml | 3 ++- gix-credentials/src/program/mod.rs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7912220299d..fcef779fbef 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1580,11 +1580,11 @@ dependencies = [ "gix-prompt", "gix-sec 0.10.8", "gix-testtools", - "gix-trace 0.1.9", "gix-url", "once_cell", "serde", "thiserror", + "tracing", ] [[package]] diff --git a/gix-credentials/Cargo.toml b/gix-credentials/Cargo.toml index 8b47af7bfc4..da6da53e894 100644 --- a/gix-credentials/Cargo.toml +++ b/gix-credentials/Cargo.toml @@ -17,13 +17,14 @@ doctest = false serde = ["dep:serde", "bstr/serde", "gix-sec/serde"] [dependencies] +tracing = "^0.1" gix-sec = { version = "^0.10.8", path = "../gix-sec" } gix-url = { version = "^0.27.5", path = "../gix-url" } gix-path = { version = "^0.10.10", path = "../gix-path" } gix-command = { version = "^0.3.9", path = "../gix-command" } gix-config-value = { version = "^0.14.8", path = "../gix-config-value" } gix-prompt = { version = "^0.8.7", path = "../gix-prompt" } -gix-trace = { version = "^0.1.8", path = "../gix-trace" } +# gix-trace = { version = "^0.1.8", path = "../gix-trace" } thiserror = "1.0.32" serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] } diff --git a/gix-credentials/src/program/mod.rs b/gix-credentials/src/program/mod.rs index 4715b1ab0ca..48553405968 100644 --- a/gix-credentials/src/program/mod.rs +++ b/gix-credentials/src/program/mod.rs @@ -120,7 +120,7 @@ impl Program { ) -> std::io::Result<(std::process::ChildStdin, Option)> { assert!(self.child.is_none(), "BUG: must not call `start()` twice"); let mut cmd = self.to_command(action); - gix_trace::debug!(cmd = ?cmd, "launching credential helper"); + tracing::debug!(cmd = ?cmd, "launching credential helper"); let mut child = cmd.spawn()?; let stdin = child.stdin.take().expect("stdin to be configured"); let stdout = child.stdout.take();