Skip to content

fix: MacOS, Windows: No Git executable found #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexmylonas wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: MacOS, Windows: No Git executable found #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions src/fs/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,8 +156,14 @@ pub mod application {
pub async fn find_git_executable<S: AsRef<str>>(min_version: S) -> Result<String, Error> {
// parse the git version from the --version output
fn parse_version(output: &str) -> Option<Version> {
let version_str = output.rsplit_once(' ')?.1.trim();
Version::parse(version_str).ok()
// works for:
// Linux: git version 2.39.5
// MacOS: git version 2.39.5 (Apple Git-154)
// Windows: git version 2.39.5.windows.1
let version_str = output.
split_ascii_whitespace().nth(2).unwrap_or("unknown")
.split(".").take(3).collect::<Vec<&str>>().join(".");
Version::parse(&version_str).ok()
}

let min_version =
Expand Down Expand Up @@ -205,7 +211,7 @@ pub mod application {
let version_output = String::from_utf8_lossy(&output.stdout);
debug!("Git version output: {}", version_output);

// Parse version from "git version 2.34.1"
// Parse version for all OS responses
if let Some(version) = parse_version(&version_output) {
if version >= min_version {
info!("Found git executable: {} (version: {})", candidate, version);
Expand Down