From 4f03b290c4809b4d3a652f43779b3a53d98ff37a Mon Sep 17 00:00:00 2001
From: Josh Junon <josh@gitbutler.com>
Date: Thu, 18 Jan 2024 17:38:32 +0100
Subject: [PATCH] harden git backends against various configs

---
 gitbutler-git/Cargo.toml                  | 2 +-
 gitbutler-git/src/backend/cli/executor.rs | 2 +-
 gitbutler-git/src/integration_tests.rs    | 2 ++
 gitbutler-git/src/lib.rs                  | 1 +
 4 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/gitbutler-git/Cargo.toml b/gitbutler-git/Cargo.toml
index eb388e114..a97add921 100644
--- a/gitbutler-git/Cargo.toml
+++ b/gitbutler-git/Cargo.toml
@@ -18,4 +18,4 @@ serde = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true, features = ["process"]}
 
 [dev-dependencies]
-tokio = { workspace = true, features = ["rt", "rt-multi-thread"]}
+tokio = { workspace = true, features = ["rt", "rt-multi-thread", "process"]}
diff --git a/gitbutler-git/src/backend/cli/executor.rs b/gitbutler-git/src/backend/cli/executor.rs
index 42493e9a9..47266367f 100644
--- a/gitbutler-git/src/backend/cli/executor.rs
+++ b/gitbutler-git/src/backend/cli/executor.rs
@@ -1,4 +1,4 @@
-#[cfg(feature = "tokio")]
+#[cfg(any(test, feature = "tokio"))]
 pub mod tokio;
 
 /// Provides a means for executing Git CLI commands.
diff --git a/gitbutler-git/src/integration_tests.rs b/gitbutler-git/src/integration_tests.rs
index eac2aa067..f2cb83b21 100644
--- a/gitbutler-git/src/integration_tests.rs
+++ b/gitbutler-git/src/integration_tests.rs
@@ -18,6 +18,7 @@
 ///    crate::gitbutler_git_integration_tests!(make_repo);
 /// }
 /// ```
+#[allow(unused_macros)]
 macro_rules! gitbutler_git_integration_tests {
     ($create_repo:expr) => {
         $crate::gitbutler_git_integration_tests! {
@@ -60,4 +61,5 @@ macro_rules! gitbutler_git_integration_tests {
     }
 }
 
+#[allow(unused_imports)]
 pub(crate) use gitbutler_git_integration_tests;
diff --git a/gitbutler-git/src/lib.rs b/gitbutler-git/src/lib.rs
index 410c65f56..5ae41c27c 100644
--- a/gitbutler-git/src/lib.rs
+++ b/gitbutler-git/src/lib.rs
@@ -15,6 +15,7 @@ extern crate alloc;
 #[cfg(test)]
 mod integration_tests;
 #[cfg(test)]
+#[allow(unused_imports)]
 pub(crate) use integration_tests::*;
 
 mod backend;