From a8cf0c6b90bd469047ac8fc294dbf90fcff71c7a Mon Sep 17 00:00:00 2001 From: Michael Davis Date: Thu, 17 Feb 2022 22:05:12 -0600 Subject: [PATCH] filter git revision on git command success exit code (#1674) The unwrap (or '.ok()' rather) triggers for some errors but not negative status codes. In the case where helix is being packaged in an empty git repository, the existing mechanism will fail because git init git rev-parse HEAD gives a negative exit code and prints to stderr stderr: "fatal: ambiguous argument 'HEAD': unknown revision or path not in the working tree.... with a stdout of "HEAD\n" (too short to slice with [..8]). --- helix-term/build.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/helix-term/build.rs b/helix-term/build.rs index 21dd5612d..b5d62b285 100644 --- a/helix-term/build.rs +++ b/helix-term/build.rs @@ -6,6 +6,7 @@ fn main() { .args(&["rev-parse", "HEAD"]) .output() .ok() + .filter(|output| output.status.success()) .and_then(|x| String::from_utf8(x.stdout).ok()); let version: Cow<_> = match git_hash {