6a3838d Fix git dir — heartwood

Radicle Heartwood Protocol & Stack

Fix git dir

◌ CI pending William A. Kennington III committed 2 years ago

commit 6a3838dba5c0e56fb0d63aae059ce4dae8db6c7c
parent d82d5b4c6077a537de8bf213b173a338bf9512a9

1 pending (1 total) View logs

2 files changed +4 -2

modified radicle-node/src/worker/garbage.rs

@@ -39,9 +39,10 @@ impl fmt::Display for Expiry {

 pub fn collect(storage: &impl ReadStorage, rid: RepoId, expiry: Expiry) -> io::Result<ExitStatus> {
     let git_dir = storage.path_of(&rid);
     let mut gc = Command::new("git");
     gc.current_dir(git_dir)
     gc.current_dir(git_dir.clone())
         .env_clear()
         .envs(std::env::vars().filter(|(key, _)| key == "PATH" || key.starts_with("GIT_TRACE")))
         .env("GIT_DIR", git_dir)
         .args(["gc", &format!("--prune={expiry}"), "--auto"])
         .stdout(Stdio::piped())
         .stdin(Stdio::piped())

modified radicle-node/src/worker/upload_pack.rs

@@ -51,10 +51,11 @@ where

     let git_dir = paths::repository(storage, &header.repo);
     let mut child = {
         let mut cmd = Command::new("git");
         cmd.current_dir(git_dir)
         cmd.current_dir(git_dir.clone())
             .env_clear()
             .envs(std::env::vars().filter(|(key, _)| key == "PATH" || key.starts_with("GIT_TRACE")))
             .env("GIT_PROTOCOL", format!("version={protocol_version}"))
             .env("GIT_DIR", git_dir)
             .args([
                 "-c",
                 "uploadpack.allowAnySha1InWant=true",