rustbuild: Check for .git as a dir

Git worktrees have this as a file and typically won't work inside docker
containers, but that's ok, so instead of just checking for existence check for a
directory to see if the git commands will succeed.
This commit is contained in:
Alex Crichton 2016-12-12 09:28:13 -08:00
parent 48bda31ab9
commit 5f07d3dea9
2 changed files with 2 additions and 2 deletions

View File

@ -69,7 +69,7 @@ pub fn collect(build: &mut Build) {
// If we have a git directory, add in some various SHA information of what
// commit this compiler was compiled from.
if fs::metadata(build.src.join(".git")).is_ok() {
if build.src.join(".git").is_dir() {
let ver_date = output(Command::new("git").current_dir(&build.src)
.arg("log").arg("-1")
.arg("--date=short")

View File

@ -18,7 +18,7 @@
//! out to `rust-installer` still. This may one day be replaced with bits and
//! pieces of `rustup.rs`!
use std::fs::{self, File};
use std::fs::File;
use std::io::Write;
use std::path::{PathBuf, Path};
use std::process::Command;