crates/cli/src/repo/handlers/advance_main.rs

@@ -41,7 +41,7 @@ impl Handler<AdvanceMain> for RepoActor {
         } else {
             self.update_tui(RepoUpdate::MainUpdated);
             if let Some(open_repository) = &self.open_repository {
-                match open_repository.fetch() {
+                match open_repository.fetch(&repo_details) {
                     Ok(()) => self.update_tui_log(git::graph::log(&self.repo_details)),
                     Err(err) => self.alert_tui(format!("fetching: {err}")),
                 }

crates/cli/src/repo/handlers/advance_next.rs

@@ -51,7 +51,7 @@ impl Handler<AdvanceNext> for RepoActor {
         ) {
             Ok(message_token) => {
                 self.update_tui(RepoUpdate::NextUpdated);
-                match open_repository.fetch() {
+                match open_repository.fetch(&repo_details) {
                     Ok(()) => self.update_tui_log(git::graph::log(&self.repo_details)),
                     Err(err) => self.alert_tui(format!("fetching: {err}")),
                 }

crates/cli/src/repo/tests/expect.rs

@@ -11,7 +11,7 @@ pub fn fetch(open_repository: &mut MockOpenRepositoryLike, result: Result<(), fe
     open_repository
         .expect_fetch()
         .times(1)
-        .return_once(|| result);
+        .return_once(|_| result);
 }
 
 pub fn push_ok(open_repository: &mut MockOpenRepositoryLike) {

crates/cli/src/repo/tests/handlers/advance_main.rs

@@ -19,7 +19,7 @@ async fn when_repo_config_should_fetch_then_push_then_revalidate() -> TestResult
         .expect_fetch()
         .times(1)
         .in_sequence(&mut seq)
-        .return_once(|| Ok(()));
+        .return_once(|_| Ok(()));
     open_repository
         .expect_push()
         .times(1)
@@ -29,7 +29,7 @@ async fn when_repo_config_should_fetch_then_push_then_revalidate() -> TestResult
         .expect_fetch()
         .times(1)
         .in_sequence(&mut seq)
-        .return_once(|| Ok(()));
+        .return_once(|_| Ok(()));
 
     //when
     let (addr, log) = when::start_actor_with_open_repository(
@@ -69,7 +69,7 @@ async fn when_app_config_should_fetch_then_push_then_revalidate() -> TestResult
         .expect_fetch()
         .times(1)
         .in_sequence(&mut seq)
-        .return_once(|| Ok(()));
+        .return_once(|_| Ok(()));
     open_repository
         .expect_push()
         .times(1)
@@ -79,7 +79,7 @@ async fn when_app_config_should_fetch_then_push_then_revalidate() -> TestResult
         .expect_fetch()
         .times(1)
         .in_sequence(&mut seq)
-        .return_once(|| Ok(()));
+        .return_once(|_| Ok(()));
 
     //when
     let (addr, log) = when::start_actor_with_open_repository(

crates/cli/src/repo/tests/handlers/advance_next.rs

@@ -22,7 +22,7 @@ async fn should_fetch_then_push_then_revalidate() -> TestResult {
         .expect_fetch()
         .times(1)
         .in_sequence(&mut seq)
-        .return_once(|| Ok(()));
+        .return_once(|_| Ok(()));
     open_repository
         .expect_push()
         .times(1)
@@ -32,7 +32,7 @@ async fn should_fetch_then_push_then_revalidate() -> TestResult {
         .expect_fetch()
         .times(1)
         .in_sequence(&mut seq)
-        .return_once(|| Ok(()));
+        .return_once(|_| Ok(()));
 
     //when
     let (addr, log) = when::start_actor_with_open_repository(

crates/cli/src/repo/tests/handlers/validate_repo.rs

@@ -486,7 +486,7 @@ async fn should_send_validate_repo_when_retryable_error() -> TestResult {
     //given
     let fs = given::a_filesystem();
     let (mut open_repository, repo_details) = given::an_open_repository(&fs);
-    open_repository.expect_fetch().return_once(|| Ok(()));
+    open_repository.expect_fetch().return_once(|_| Ok(()));
     open_repository
         .expect_commit_log()
         .return_once(|_, _| Err(git::commit::log::Error::Lock));
@@ -517,7 +517,7 @@ async fn should_send_notify_user_when_non_retryable_error() -> TestResult {
     let (mut open_repository, repo_details) = given::an_open_repository(&fs);
     #[allow(clippy::unwrap_used)]
     let repo_config = repo_details.repo_config.clone().unwrap();
-    open_repository.expect_fetch().return_once(|| Ok(()));
+    open_repository.expect_fetch().return_once(|_| Ok(()));
 
     // branches are all unrelated - non-retryable until each branch is updated
     let branches = repo_config.branches();

crates/core/src/git/push.rs

@@ -61,6 +61,6 @@ pub fn reset(
     to_commit: &git::GitRef,
     force: &git::push::Force,
 ) -> Result<()> {
-    open_repository.fetch()?;
+    open_repository.fetch(repo_details)?;
     open_repository.push(repo_details, branch_name, to_commit, force)
 }

crates/core/src/git/repository/mod.rs

@@ -1,7 +1,6 @@
 //
 use crate::{
     git::{
-        self,
         repository::{
             open::{OpenRepository, OpenRepositoryLike},
             test::TestRepository,
@@ -48,9 +47,7 @@ pub fn open(
 ) -> Result<Box<dyn OpenRepositoryLike>> {
     let open_repository = if repo_details.gitdir.exists() {
         info!("Local copy found - opening...");
-        let repo = repository_factory.open(repo_details)?;
+        repository_factory.open(repo_details)?
-        repo.fetch()?;
-        repo
     } else {
         info!("Local copy not found - cloning...");
         repository_factory.git_clone(repo_details)?
@@ -120,9 +117,6 @@ pub enum Error {
     #[error("git clone: {0}")]
     Clone(String),
 
-    #[error("git fetch: {0}")]
-    FetchError(#[from] git::fetch::Error),
-
     #[error("open: {0}")]
     Open(String),
 

crates/core/src/git/repository/open/mod.rs

@@ -82,7 +82,7 @@ pub trait OpenRepositoryLike: std::fmt::Debug + Sync {
     ///
     /// Will return an `Err` if their is no remote fetch defined in .git/config, or
     /// if there are any network connectivity issues with the remote server.
-    fn fetch(&self) -> Result<(), git::fetch::Error>;
+    fn fetch(&self, repo_details: &git::RepoDetails) -> Result<(), git::fetch::Error>;
 
     /// Performs a `git push`
     ///

crates/core/src/git/repository/open/oreal.rs

@@ -66,18 +66,23 @@ impl super::OpenRepositoryLike for RealOpenRepository {
 
     #[tracing::instrument(skip_all)]
     #[cfg(not(tarpaulin_include))] // would require writing to external service
-    fn fetch(&self) -> Result<(), git::fetch::Error> {
+    fn fetch(&self, repo_details: &git::RepoDetails) -> Result<(), git::fetch::Error> {
-        info!("Fetching");
+        use secrecy::ExposeSecret;
-        gix::command::prepare("/usr/bin/git fetch --prune")
+
-            .with_context(gix::diff::command::Context {
+        let origin = repo_details.origin();
-                git_dir: Some(
+        let command: secrecy::Secret<String> =
-                    self.inner
+            format!("/usr/bin/git fetch {}", origin.expose_secret()).into();
-                        .read()
+        let git_dir = self
-                        .map_err(|_| git::fetch::Error::Lock)
+            .inner
-                        .map(|r| r.git_dir().to_path_buf())?,
+            .read()
-                ),
+            .map_err(|_| git::fetch::Error::Lock)
-                ..Default::default()
+            .map(|r| r.git_dir().to_path_buf())?;
-            })
+        let ctx = gix::diff::command::Context {
+            git_dir: Some(git_dir),
+            ..Default::default()
+        };
+        gix::command::prepare(command.expose_secret())
+            .with_context(ctx)
             .with_shell_allow_argument_splitting()
             .stdout(std::process::Stdio::null())
             .stderr(std::process::Stdio::null())

crates/core/src/git/repository/open/otest.rs

@@ -94,7 +94,7 @@ impl git::repository::OpenRepositoryLike for TestOpenRepository {
         self.real.find_default_remote(direction)
     }
 
-    fn fetch(&self) -> Result<(), git::fetch::Error> {
+    fn fetch(&self, _repo_details: &git::RepoDetails) -> Result<(), git::fetch::Error> {
         let i: usize = *self
             .fetch_counter
             .read()

crates/core/src/git/repository/open/tests/fetch.rs

@@ -9,5 +9,5 @@ fn should_fetch_from_repo() {
     let gitdir = GitDir::new(cwd.join("../.."), StoragePathType::External);
     let repo_details = given::repo_details(&given::a_filesystem()).with_gitdir(gitdir);
     let_assert!(Ok(repo) = crate::git::repository::factory::real().open(&repo_details));
-    let_assert!(Ok(()) = repo.fetch());
+    let_assert!(Ok(()) = repo.fetch(&repo_details));
 }

crates/core/src/git/tests.rs

@@ -125,7 +125,7 @@ mod push {
                 .expect_fetch()
                 .times(1)
                 .in_sequence(&mut seq)
-                .returning(|| Ok(()));
+                .returning(|_| Ok(()));
             open_repository
                 .expect_push()
                 .times(1)

crates/core/src/git/validation/positions.rs

@@ -33,7 +33,7 @@ pub fn validate(
     let next_branch = repo_config.branches().next();
     let dev_branch = repo_config.branches().dev();
     // Collect Commit Histories for `main`, `next` and `dev` branches
-    open_repository.fetch()?;
+    open_repository.fetch(repo_details)?;
     let git_log = git::graph::log(repo_details);
 
     let commit_histories = get_commit_histories(open_repository, repo_config)?;

crates/core/src/git/validation/tests.rs

@@ -64,7 +64,7 @@ mod positions {
             let mut mock_open_repository = git::repository::open::mock();
             mock_open_repository
                 .expect_fetch()
-                .return_once(|| Err(git::fetch::Error::TestFailureExpected));
+                .return_once(|_| Err(git::fetch::Error::TestFailureExpected));
             let mut repository_factory = git::repository::factory::mock();
             repository_factory
                 .expect_open()
@@ -93,7 +93,7 @@ mod positions {
             let repo_config = given::a_repo_config();
             let main_branch = repo_config.branches().main();
             let mut mock_open_repository = git::repository::open::mock();
-            mock_open_repository.expect_fetch().return_once(|| Ok(()));
+            mock_open_repository.expect_fetch().return_once(|_| Ok(()));
             mock_open_repository
                 .expect_commit_log()
                 .returning(move |branch_name, _| {
@@ -132,7 +132,7 @@ mod positions {
             let repo_config = given::a_repo_config();
             let next_branch = repo_config.branches().next();
             let mut mock_open_repository = git::repository::open::mock();
-            mock_open_repository.expect_fetch().return_once(|| Ok(()));
+            mock_open_repository.expect_fetch().return_once(|_| Ok(()));
             mock_open_repository
                 .expect_commit_log()
                 .returning(move |branch_name, _| {
@@ -171,7 +171,7 @@ mod positions {
             let repo_config = given::a_repo_config();
             let dev_branch = repo_config.branches().dev();
             let mut mock_open_repository = git::repository::open::mock();
-            mock_open_repository.expect_fetch().return_once(|| Ok(()));
+            mock_open_repository.expect_fetch().return_once(|_| Ok(()));
             mock_open_repository
                 .expect_commit_log()
                 .returning(move |branch_name, _| {