Fix build without git

2 files changed, 8 insertions, 4 deletions

diff --git a/alacritty/build.rs b/alacritty/build.rs
index 1ad0def4..b39921c0 100644
--- a/alacritty/build.rs
+++ b/alacritty/build.rs
@@ -13,6 +13,6 @@
 // limitations under the License.
 
 fn main() {
-    let hash = rustc_tools_util::get_commit_hash().expect("couldn't get commit hash");
+    let hash = rustc_tools_util::get_commit_hash().unwrap_or_default();
     println!("cargo:rustc-env=GIT_HASH={}", hash);
 }
diff --git a/alacritty/src/cli.rs b/alacritty/src/cli.rs
index 3ecea644..9e7493bc 100644
--- a/alacritty/src/cli.rs
+++ b/alacritty/src/cli.rs
@@ -61,12 +61,16 @@ impl Default for Options {
 impl Options {
     /// Build `Options` from command line arguments.
     pub fn new() -> Self {
-        let mut options = Options::default();
+        let mut version = crate_version!().to_owned();
+        let commit_hash = env!("GIT_HASH");
+        if !commit_hash.is_empty() {
+            version = format!("{} ({})", version, commit_hash);
+        }
 
-        let version_string = format!("{} ({})", crate_version!(), env!("GIT_HASH"));
+        let mut options = Options::default();
 
         let matches = App::new(crate_name!())
-            .version(version_string.as_str())
+            .version(version.as_str())
             .author(crate_authors!("\n"))
             .about(crate_description!())
             .arg(Arg::with_name("ref-test").long("ref-test").help("Generates ref test"))