From ebc9e9674f91118d70f9827a1fa62d7540d19496 Mon Sep 17 00:00:00 2001 From: sxyazi Date: Fri, 10 Jan 2025 16:21:36 +0800 Subject: [PATCH] minor refactor --- yazi-cli/src/package/dependency.rs | 2 +- yazi-cli/src/package/deploy.rs | 6 +----- yazi-cli/src/package/git.rs | 6 ++++-- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/yazi-cli/src/package/dependency.rs b/yazi-cli/src/package/dependency.rs index 8867f819..78e2b5a5 100644 --- a/yazi-cli/src/package/dependency.rs +++ b/yazi-cli/src/package/dependency.rs @@ -73,7 +73,7 @@ impl FromStr for Dependency { use_: s.to_owned(), name: format!("{name}.yazi"), parent: format!("{parent}{}", if child.is_empty() { ".yazi" } else { "" }), - child: child.to_owned(), + child: if child.is_empty() { String::new() } else { format!("{child}.yazi") }, ..Default::default() }) } diff --git a/yazi-cli/src/package/deploy.rs b/yazi-cli/src/package/deploy.rs index 2e32f6bc..1f4469e2 100644 --- a/yazi-cli/src/package/deploy.rs +++ b/yazi-cli/src/package/deploy.rs @@ -9,11 +9,7 @@ use super::Dependency; impl Dependency { pub(super) async fn deploy(&mut self) -> Result<()> { - let from = if self.child.is_empty() { - self.local().join(&self.child) - } else { - self.local().join(format!("{}.yazi", self.child)) - }; + let from = self.local().join(&self.child); self.header("Deploying package `{name}`")?; self.is_flavor = maybe_exists(&from.join("flavor.toml")).await; diff --git a/yazi-cli/src/package/git.rs b/yazi-cli/src/package/git.rs index 49e7c14e..5da090bf 100644 --- a/yazi-cli/src/package/git.rs +++ b/yazi-cli/src/package/git.rs @@ -43,8 +43,10 @@ impl Git { } async fn exec(f: impl FnOnce(&mut Command) -> &mut Command) -> Result<()> { - let status = - f(&mut Command::new("git")).status().await.context("Failed to execute `git` command")?; + let status = f(Command::new("git").args(["-c", "advice.detachedHead=false"])) + .status() + .await + .context("Failed to execute `git` command")?; if !status.success() { bail!("`git` command failed: {status}");