From dcd94736a995a1b9401b350bba2e7487f91bc385 Mon Sep 17 00:00:00 2001
From: Paul Campbell <pcampbell@kemitix.net>
Date: Sat, 8 Jun 2024 21:13:31 +0100
Subject: [PATCH] refactor: git::push::reset takes all params as refs

---
 crates/git/src/push.rs                  |  6 +++---
 crates/git/src/repository/mock.rs       | 12 ++++++------
 crates/git/src/repository/open/mod.rs   |  6 +++---
 crates/git/src/repository/open/oreal.rs |  6 +++---
 crates/git/src/validation/positions.rs  | 12 ++++++------
 crates/repo-actor/src/branch.rs         | 12 ++++++------
 6 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/crates/git/src/push.rs b/crates/git/src/push.rs
index 4490ff3..1d26279 100644
--- a/crates/git/src/push.rs
+++ b/crates/git/src/push.rs
@@ -45,9 +45,9 @@ pub enum Error {
 pub fn reset(
     repository: &git::OpenRepository,
     repo_details: &git::RepoDetails,
-    branch_name: config::BranchName,
-    to_commit: git::GitRef,
-    force: git::push::Force,
+    branch_name: &config::BranchName,
+    to_commit: &git::GitRef,
+    force: &git::push::Force,
 ) -> Result<()> {
     repository.fetch()?;
     repository.push(repo_details, branch_name, to_commit, force)
diff --git a/crates/git/src/repository/mock.rs b/crates/git/src/repository/mock.rs
index 53110d6..eb252a7 100644
--- a/crates/git/src/repository/mock.rs
+++ b/crates/git/src/repository/mock.rs
@@ -129,9 +129,9 @@ impl OpenRepositoryLike for MockOpenRepository {
     fn push(
         &self,
         repo_details: &RepoDetails,
-        branch_name: git_next_config::BranchName,
-        to_commit: crate::GitRef,
-        force: crate::push::Force,
+        branch_name: &git_next_config::BranchName,
+        to_commit: &crate::GitRef,
+        force: &crate::push::Force,
     ) -> core::result::Result<(), crate::push::Error> {
         self.inner
             .lock()
@@ -179,9 +179,9 @@ impl OpenRepositoryLike for InnerMockOpenRepository {
     fn push(
         &self,
         _repo_details: &RepoDetails,
-        _branch_name: git_next_config::BranchName,
-        _to_commit: crate::GitRef,
-        _force: crate::push::Force,
+        _branch_name: &git_next_config::BranchName,
+        _to_commit: &crate::GitRef,
+        _force: &crate::push::Force,
     ) -> core::result::Result<(), crate::push::Error> {
         todo!()
     }
diff --git a/crates/git/src/repository/open/mod.rs b/crates/git/src/repository/open/mod.rs
index c440b37..86f9f10 100644
--- a/crates/git/src/repository/open/mod.rs
+++ b/crates/git/src/repository/open/mod.rs
@@ -34,9 +34,9 @@ pub trait OpenRepositoryLike {
     fn push(
         &self,
         repo_details: &git::RepoDetails,
-        branch_name: config::BranchName,
-        to_commit: git::GitRef,
-        force: git::push::Force,
+        branch_name: &config::BranchName,
+        to_commit: &git::GitRef,
+        force: &git::push::Force,
     ) -> git::push::Result<()>;
 
     /// List of commits in a branch, optionally up-to any specified commit.
diff --git a/crates/git/src/repository/open/oreal.rs b/crates/git/src/repository/open/oreal.rs
index 0dd8b42..be921f4 100644
--- a/crates/git/src/repository/open/oreal.rs
+++ b/crates/git/src/repository/open/oreal.rs
@@ -73,9 +73,9 @@ impl super::OpenRepositoryLike for RealOpenRepository {
     fn push(
         &self,
         repo_details: &git::RepoDetails,
-        branch_name: config::BranchName,
-        to_commit: git::GitRef,
-        force: git::push::Force,
+        branch_name: &config::BranchName,
+        to_commit: &git::GitRef,
+        force: &git::push::Force,
     ) -> Result<(), git::push::Error> {
         let origin = repo_details.origin();
         let force = match force {
diff --git a/crates/git/src/validation/positions.rs b/crates/git/src/validation/positions.rs
index af29a66..d6db1a6 100644
--- a/crates/git/src/validation/positions.rs
+++ b/crates/git/src/validation/positions.rs
@@ -69,9 +69,9 @@ pub fn validate_positions(
         if let Err(err) = git::push::reset(
             repository,
             repo_details,
-            repo_config.branches().next(),
-            main.into(),
-            git::push::Force::From(next.clone().into()),
+            &repo_config.branches().next(),
+            &main.into(),
+            &git::push::Force::From(next.clone().into()),
         ) {
             warn!(?err, "Failed to reset next to main");
             return Err(git::validation::positions::Error::FailedToResetBranch {
@@ -99,9 +99,9 @@ pub fn validate_positions(
         if let Err(err) = git::push::reset(
             repository,
             repo_details,
-            repo_config.branches().next(),
-            main.into(),
-            git::push::Force::From(next.clone().into()),
+            &repo_config.branches().next(),
+            &main.into(),
+            &git::push::Force::From(next.clone().into()),
         ) {
             warn!(?err, "Failed to reset next to main");
             return Err(git::validation::positions::Error::FailedToResetBranch {
diff --git a/crates/repo-actor/src/branch.rs b/crates/repo-actor/src/branch.rs
index 9efbf73..d514b82 100644
--- a/crates/repo-actor/src/branch.rs
+++ b/crates/repo-actor/src/branch.rs
@@ -33,9 +33,9 @@ pub async fn advance_next(
     if let Err(err) = git::push::reset(
         &repository,
         &repo_details,
-        repo_config.branches().next(),
-        commit.into(),
-        git::push::Force::No,
+        &repo_config.branches().next(),
+        &commit.into(),
+        &git::push::Force::No,
     ) {
         warn!(?err, "Failed")
     }
@@ -87,9 +87,9 @@ pub async fn advance_main(
     if let Err(err) = git::push::reset(
         repository,
         repo_details,
-        repo_config.branches().main(),
-        next.into(),
-        git::push::Force::No,
+        &repo_config.branches().main(),
+        &next.into(),
+        &git::push::Force::No,
     ) {
         warn!(?err, "Failed")
     };