From cade73a7a09a8ed0384ea47f372c910cff42cc8c Mon Sep 17 00:00:00 2001
From: Ed Page <eopage@gmail.com>
Date: Wed, 18 Dec 2024 14:56:12 -0600
Subject: [PATCH] test(git): Make test backend clearer

---
 tests/testsuite/git_shallow.rs | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/tests/testsuite/git_shallow.rs b/tests/testsuite/git_shallow.rs
index fce4c7c1d..f330c7f97 100644
--- a/tests/testsuite/git_shallow.rs
+++ b/tests/testsuite/git_shallow.rs
@@ -4,22 +4,27 @@ use cargo_test_support::{basic_manifest, git, paths, project};
 
 use crate::git_gc::find_index;
 
+enum Backend {
+    Git2,
+    Gitoxide,
+}
+
 enum RepoMode {
     Shallow,
     Complete,
 }
 
 #[cargo_test]
-fn gitoxide_clones_shallow_two_revs_same_deps() {
-    perform_two_revs_same_deps(RepoMode::Shallow)
+fn gitoxide_fetch_shallow_two_revs_same_deps() {
+    fetch_two_revs_same_deps(Backend::Gitoxide, RepoMode::Shallow)
 }
 
 #[cargo_test]
-fn two_revs_same_deps() {
-    perform_two_revs_same_deps(RepoMode::Complete)
+fn git2_fetch_complete_two_revs_same_deps() {
+    fetch_two_revs_same_deps(Backend::Git2, RepoMode::Complete)
 }
 
-fn perform_two_revs_same_deps(mode: RepoMode) {
+fn fetch_two_revs_same_deps(backend: Backend, mode: RepoMode) {
     let bar = git::new("meta-dep", |project| {
         project
             .file("Cargo.toml", &basic_manifest("bar", "0.0.0"))
@@ -97,12 +102,18 @@ fn perform_two_revs_same_deps(mode: RepoMode) {
         )
         .build();
 
+    let backend_args = match backend {
+        Backend::Git2 => "",
+        Backend::Gitoxide => "-Zgitoxide=fetch",
+    };
     let mode_args = match mode {
         RepoMode::Complete => "",
-        RepoMode::Shallow => "-Zgitoxide=fetch -Zgit=shallow-deps",
+        RepoMode::Shallow => "-Zgit=shallow-deps",
     };
     foo.cargo("check -v")
+        .arg_line(backend_args)
         .arg_line(mode_args)
+        .env("__CARGO_USE_GITOXIDE_INSTEAD_OF_GIT2", "0") // respect `backend`
         .masquerade_as_nightly_cargo(&["gitoxide=fetch", "git=shallow-deps"])
         .run();
 }