refactor

- carog fmt

Author: Byron

src/command/release/git.rs

@@ -20,40 +20,43 @@ pub(in crate::command::release_impl) fn commit_changes<'a>(
     // `git commit -am` only stages tracked files, so we need to explicitly add new ones.
     if !changelog_paths.is_empty() {
         let index = ctx.repo.open_index()?;
-        let worktree = ctx.repo.workdir().expect("this is a worktree repository");
-        
+        let workdir = ctx.repo.workdir().context("Can only work in non-bare repositories")?;
+
         let untracked_paths: Vec<_> = changelog_paths
             .iter()
             .filter(|path| {
                 // Convert absolute path to worktree-relative path with forward slashes
-                path.as_ref()
-                    .strip_prefix(worktree)
-                    .ok()
-                    .map(|relative_path| {
-                        let relative_path_unix =
-                            gix::path::to_unix_separators(gix::path::into_bstr(relative_path));
-                        // Check if the path is NOT tracked in the git index
-                        index.entry_by_path(relative_path_unix.as_bstr()).is_none()
-                    })
-                    .unwrap_or(false)
+                path.as_ref().strip_prefix(workdir).ok().is_some_and(|relative_path| {
+                    let relative_path_unix = gix::path::to_unix_separators(gix::path::into_bstr(relative_path));
+                    // Check if the path is NOT tracked in the git index
+                    index.entry_by_path(relative_path_unix.as_bstr()).is_none()
+                })
             })
             .collect();
 
         if !untracked_paths.is_empty() {
-            let mut add_cmd = Command::new("git");
-            add_cmd.arg("add").arg("--");
+            let mut git_add = Command::new(gix::path::env::exe_invocation());
+            git_add.args(["add", "--"]);
             for path in &untracked_paths {
-                add_cmd.arg(path.as_ref());
+                git_add.arg(path.as_ref());
             }
-            log::trace!("{} run {:?}", will(dry_run), add_cmd);
-            if !dry_run && !add_cmd.status()?.success() {
-                let paths: Vec<_> = untracked_paths.iter().map(|p| p.as_ref().display().to_string()).collect();
-                bail!("Failed to add new changelog files to git: {}", paths.join(", "));
+            log::trace!("{} run {:?}", will(dry_run), git_add);
+            let output = git_add.output()?;
+            if !dry_run && !output.status.success() {
+                let paths: Vec<_> = untracked_paths
+                    .iter()
+                    .map(|p| p.as_ref().display().to_string())
+                    .collect();
+                bail!(
+                    "Failed to add new changelog files to git: {}: {err}",
+                    paths.join(", "),
+                    err = output.stderr.to_str_lossy()
+                );
             }
         }
     }
 
-    let mut cmd = Command::new("git");
+    let mut cmd = Command::new(gix::path::env::exe_invocation());
     cmd.arg("commit").arg("-am").arg(message.as_ref());
     if empty_commit_possible {
         cmd.arg("--allow-empty");
@@ -134,7 +137,7 @@ pub fn push_tags_and_head(
         return Ok(());
     }
 
-    let mut cmd = Command::new("git");
+    let mut cmd = Command::new(gix::path::env::exe_invocation());
     cmd.arg("push")
         .arg({
             let remote = repo

src/git/mod.rs

@@ -71,7 +71,7 @@ pub fn change_since_last_release(package: &Package, ctx: &crate::Context) -> any
 }
 
 pub fn assure_clean_working_tree() -> anyhow::Result<()> {
-    let tracked_changed = !Command::new("git")
+    let tracked_changed = !Command::new(gix::path::env::exe_invocation())
         .arg("diff")
         .arg("HEAD")
         .arg("--exit-code")
@@ -82,7 +82,7 @@ pub fn assure_clean_working_tree() -> anyhow::Result<()> {
         bail!("Detected working tree changes. Please commit beforehand as otherwise these would be committed as part of manifest changes, or use --allow-dirty to force it.")
     }
 
-    let untracked = Command::new("git")
+    let untracked = Command::new(gix::path::env::exe_invocation())
         .arg("ls-files")
         .arg("--exclude-standard")
         .arg("--others")
@@ -104,7 +104,11 @@ pub fn remote_url(repo: &gix::Repository) -> anyhow::Result<Option<gix::Url>> {
 }
 
 pub fn author() -> anyhow::Result<gix::actor::Signature> {
-    let stdout = Command::new("git").arg("var").arg("GIT_AUTHOR_IDENT").output()?.stdout;
+    let stdout = Command::new(gix::path::env::exe_invocation())
+        .arg("var")
+        .arg("GIT_AUTHOR_IDENT")
+        .output()?
+        .stdout;
     Ok(gix::actor::SignatureRef::from_bytes::<()>(&stdout)
         .ok()
         .ok_or_else(|| anyhow!("Could not parse author from GIT_AUTHOR_IDENT='{}'", stdout.as_bstr()))?