use gix_path::env::executable_invocation() where possible.

That way we are more likely to find Git even on platforms that
don't have a reliable PATH.

Author: Byron

Cargo.lock

@@ -74,7 +74,7 @@ pub(crate) mod function {
                 let tx_base = tx_base.clone();
                 let mut progress = progress.add_child("attributes");
                 move || -> anyhow::Result<()> {
-                    let mut child = std::process::Command::new(GIT_NAME)
+                    let mut child = std::process::Command::new(gix::path::env::exe_invocation())
                         .args(["check-attr", "--stdin", "-a"])
                         .stdin(std::process::Stdio::piped())
                         .stdout(std::process::Stdio::piped())
@@ -125,7 +125,7 @@ pub(crate) mod function {
                 let tx_base = tx_base.clone();
                 let mut progress = progress.add_child("excludes");
                 move || -> anyhow::Result<()> {
-                    let mut child = std::process::Command::new(GIT_NAME)
+                    let mut child = std::process::Command::new(gix::path::env::exe_invocation())
                         .args(["check-ignore", "--stdin", "-nv", "--no-index"])
                         .stdin(std::process::Stdio::piped())
                         .stdout(std::process::Stdio::piped())
@@ -254,8 +254,6 @@ pub(crate) mod function {
         }
     }
 
-    static GIT_NAME: &str = if cfg!(windows) { "git.exe" } else { "git" };
-
     enum Baseline {
         Attribute { assignments: Vec<gix::attrs::Assignment> },
         Exclude { location: Option<ExcludeLocation> },

gitoxide-core/src/repository/attributes/validate_baseline.rs

@@ -27,7 +27,7 @@ gix-trace = { version = "^0.1.8", path = "../gix-trace" }
 
 thiserror = "1.0.32"
 serde = { version = "1.0.114", optional = true, default-features = false, features = ["derive"] }
-bstr = { version = "1.3.0", default-features = false, features = ["std"]}
+bstr = { version = "1.3.0", default-features = false, features = ["std"] }
 
 
 
@@ -36,6 +36,7 @@ document-features = { version = "0.2.1", optional = true }
 [dev-dependencies]
 gix-testtools = { path = "../tests/tools" }
 gix-sec = { path = "../gix-sec" }
+once_cell = "1.19.0"
 
 [package.metadata.docs.rs]
 all-features = true

gix-credentials/Cargo.toml

@@ -68,7 +68,7 @@ impl Program {
 
     /// Convert the program into the respective command, suitable to invoke `action`.
     pub fn to_command(&self, action: &helper::Action) -> std::process::Command {
-        let git_program = cfg!(windows).then(|| "git.exe").unwrap_or("git");
+        let git_program = gix_path::env::exe_invocation();
         let mut cmd = match &self.kind {
             Kind::Builtin => {
                 let mut cmd = Command::new(git_program);
@@ -79,7 +79,7 @@ impl Program {
                 let mut args = name_and_args.clone();
                 args.insert_str(0, "credential-");
                 args.insert_str(0, " ");
-                args.insert_str(0, git_program);
+                args.insert_str(0, git_program.to_string_lossy().as_ref());
                 gix_command::prepare(gix_path::from_bstr(args.as_ref()).into_owned())
                     .arg(action.as_arg(true))
                     .with_shell_allow_argument_splitting()

gix-credentials/src/program/mod.rs

@@ -1,9 +1,7 @@
 use gix_credentials::{helper, program::Kind, Program};
 
-#[cfg(windows)]
-const GIT: &str = "git.exe";
-#[cfg(not(windows))]
-const GIT: &str = "git";
+static GIT: once_cell::sync::Lazy<&'static str> =
+    once_cell::sync::Lazy::new(|| gix_path::env::exe_invocation().to_str().expect("not illformed"));
 
 #[cfg(windows)]
 const SH: &str = "sh";
@@ -13,10 +11,11 @@ const SH: &str = "/bin/sh";
 #[test]
 fn empty() {
     let prog = Program::from_custom_definition("");
+    let git = *GIT;
     assert!(matches!(&prog.kind, Kind::ExternalName { name_and_args } if name_and_args == ""));
     assert_eq!(
         format!("{:?}", prog.to_command(&helper::Action::Store("egal".into()))),
-        format!(r#""{GIT}" "credential-" "store""#),
+        format!(r#""{git}" "credential-" "store""#),
         "not useful, but allowed, would have to be caught elsewhere"
     );
 }
@@ -36,32 +35,35 @@ fn simple_script_in_path() {
 fn name_with_args() {
     let input = "name --arg --bar=\"a b\"";
     let prog = Program::from_custom_definition(input);
+    let git = *GIT;
     assert!(matches!(&prog.kind, Kind::ExternalName{name_and_args} if name_and_args == input));
     assert_eq!(
         format!("{:?}", prog.to_command(&helper::Action::Store("egal".into()))),
-        format!(r#""{GIT}" "credential-name" "--arg" "--bar=a b" "store""#)
+        format!(r#""{git}" "credential-name" "--arg" "--bar=a b" "store""#)
     );
 }
 
 #[test]
 fn name_with_special_args() {
     let input = "name --arg --bar=~/folder/in/home";
     let prog = Program::from_custom_definition(input);
+    let git = *GIT;
     assert!(matches!(&prog.kind, Kind::ExternalName{name_and_args} if name_and_args == input));
     assert_eq!(
         format!("{:?}", prog.to_command(&helper::Action::Store("egal".into()))),
-        format!(r#""{SH}" "-c" "{GIT} credential-name --arg --bar=~/folder/in/home \"$@\"" "--" "store""#)
+        format!(r#""{SH}" "-c" "{git} credential-name --arg --bar=~/folder/in/home \"$@\"" "--" "store""#)
     );
 }
 
 #[test]
 fn name() {
     let input = "name";
     let prog = Program::from_custom_definition(input);
+    let git = *GIT;
     assert!(matches!(&prog.kind, Kind::ExternalName{name_and_args} if name_and_args == input));
     assert_eq!(
         format!("{:?}", prog.to_command(&helper::Action::Store("egal".into()))),
-        format!(r#""{GIT}" "credential-name" "store""#),
+        format!(r#""{git}" "credential-name" "store""#),
         "we detect that this can run without shell, which is also more portable on windows"
     );
 }

gix-credentials/tests/program/from_custom_definition.rs

@@ -89,7 +89,7 @@ pub fn xdg_config(file: &str, env_var: &mut dyn FnMut(&str) -> Option<OsString>)
 ///
 /// ### Performance
 ///
-/// On windows, the slowest part is the launch of the `git.exe` executable in the PATH, which only happens when launched
+/// On windows, the slowest part is the launch of the Git executable in the PATH, which only happens when launched
 /// from outside of the `msys2` shell.
 ///
 /// ### When `None` is returned

gix-path/src/env/mod.rs

@@ -16,7 +16,7 @@ mod home_dir {
 
 mod env {
     #[test]
-    fn executable_invocation() {
+    fn exe_invocation() {
         let actual = gix_path::env::exe_invocation();
         assert!(
             !actual.as_os_str().is_empty(),