From b495f78dfe7641f2047f1684561c842f20a8518b Mon Sep 17 00:00:00 2001 From: Filipe Paniguel Date: Fri, 10 Jan 2025 05:25:13 -0300 Subject: [PATCH] fix: incorrect monorepo sub-plugin path resolution (#2186) Co-authored-by: sxyazi --- yazi-cli/src/package/dependency.rs | 2 +- yazi-cli/src/package/git.rs | 6 ++++-- 2 files changed, 5 insertions(+), 3 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/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}");