From 57a614bad351c13788b6209635578b082abddb4d Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Fri, 12 Jul 2024 08:12:45 +0100 Subject: [PATCH] fix: don't modify config of external repos The git config files of external repos are read-only. This is the only place where we make reference to a remote named 'origin', so this also closes kemitix/git-next#85. Closes kemitix/git-next#85 --- crates/git/src/repo_details.rs | 2 +- crates/repo-actor/src/tests/handlers/validate_repo.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/git/src/repo_details.rs b/crates/git/src/repo_details.rs index b8f1ea3..a24f1db 100644 --- a/crates/git/src/repo_details.rs +++ b/crates/git/src/repo_details.rs @@ -138,7 +138,7 @@ impl RepoDetails { #[tracing::instrument] pub fn write_remote_url(&self, url: &RemoteUrl) -> Result<(), kxio::fs::Error> { if self.gitdir.storage_path_type() != StoragePathType::Internal { - // return Err(Not an internal repo) + return Ok(()); } let fs = self.gitdir.as_fs(); // load config file diff --git a/crates/repo-actor/src/tests/handlers/validate_repo.rs b/crates/repo-actor/src/tests/handlers/validate_repo.rs index c7479ee..8fca719 100644 --- a/crates/repo-actor/src/tests/handlers/validate_repo.rs +++ b/crates/repo-actor/src/tests/handlers/validate_repo.rs @@ -354,7 +354,7 @@ async fn should_reject_message_with_expired_token() -> TestResult { } #[test_log::test(actix::test)] -// NOTE: failed then passed on retry: count = 3 +// NOTE: failed then passed on retry: count = 6 async fn should_send_validate_repo_when_retryable_error() -> TestResult { //given let fs = given::a_filesystem(); @@ -372,7 +372,7 @@ async fn should_send_validate_repo_when_retryable_error() -> TestResult { ); addr.send(crate::messages::ValidateRepo::new(MessageToken::default())) .await?; - tokio::time::sleep(std::time::Duration::from_millis(1)).await; + tokio::time::sleep(std::time::Duration::from_millis(2)).await; System::current().stop(); //then