From 98f7fe1db8ade2f8db2b314ba9f41c7f2ebbfde9 Mon Sep 17 00:00:00 2001 From: Alexis Sellier Date: Mon, 30 Jan 2023 18:23:24 +0100 Subject: [PATCH] node: Rename `GIT_RESET` env var --- radicle-node/src/runtime.rs | 2 +- radicle-node/src/service.rs | 8 ++++---- radicle-node/src/worker.rs | 2 +- radicle/src/git.rs | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/radicle-node/src/runtime.rs b/radicle-node/src/runtime.rs index 1664a3bd..3e54ab23 100644 --- a/radicle-node/src/runtime.rs +++ b/radicle-node/src/runtime.rs @@ -239,7 +239,7 @@ pub mod daemon { let child = Command::new("git") .env_clear() .envs(env::vars().filter(|(k, _)| k == "PATH" || k.starts_with("GIT"))) - .envs(radicle::git::env::GIT_RESET) + .envs(radicle::git::env::GIT_DEFAULT_CONFIG) .env("GIT_PROTOCOL", "version=2") .current_dir(storage) .arg("daemon") diff --git a/radicle-node/src/service.rs b/radicle-node/src/service.rs index 6e971b9c..101f27e4 100644 --- a/radicle-node/src/service.rs +++ b/radicle-node/src/service.rs @@ -101,15 +101,15 @@ pub type QueryState = dyn Fn(&dyn ServiceState) -> Result<(), CommandError> + Se /// Commands sent to the service by the operator. pub enum Command { - /// Announce repository references for given project id to peers. + /// Announce repository references for given repository to peers. AnnounceRefs(Id), /// Connect to node with the given address. Connect(NodeId, Address), - /// Fetch the given project from the network. + /// Fetch the given repository from the network. Fetch(Id, chan::Sender), - /// Track the given project. + /// Track the given repository. TrackRepo(Id, chan::Sender), - /// Untrack the given project. + /// Untrack the given repository. UntrackRepo(Id, chan::Sender), /// Track the given node. TrackNode(NodeId, Option, chan::Sender), diff --git a/radicle-node/src/worker.rs b/radicle-node/src/worker.rs index 0ad46af9..abf604dd 100644 --- a/radicle-node/src/worker.rs +++ b/radicle-node/src/worker.rs @@ -154,7 +154,7 @@ impl Worker { cmd.current_dir(repo.path()) .env_clear() .envs(env::vars().filter(|(k, _)| k == "PATH" || k.starts_with("GIT_TRACE"))) - .envs(git::env::GIT_RESET) + .envs(git::env::GIT_DEFAULT_CONFIG) .args(["-c", "protocol.version=2"]) .arg("fetch") .arg("--verbose"); diff --git a/radicle/src/git.rs b/radicle/src/git.rs index ab9e70c6..8e17723e 100644 --- a/radicle/src/git.rs +++ b/radicle/src/git.rs @@ -510,7 +510,7 @@ pub mod url { /// Git environment variables. pub mod env { /// Set of environment vars to reset git's configuration to default. - pub const GIT_RESET: [(&str, &str); 3] = [ + pub const GIT_DEFAULT_CONFIG: [(&str, &str); 3] = [ ("GIT_CONFIG", "/dev/null"), ("GIT_CONFIG_GLOBAL", "/dev/null"), ("GIT_CONFIG_NOSYSTEM", "1"),