rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rustbuild: Use current_dir instead of -C

Browse Source 
Apparently some versions of git don't support the `-C` flag, so let's use the
guaranteed-to-work `current_dir` function.
This commit is contained in:
Alex Crichton
2016-09-13 12:30:17 -07:00
parent c87ba3f122
commit d68f7eb865
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/bootstrap/lib.rs
View File

@@ -556,12 +556,18 @@ impl Build {
continue continue
} }
if !submodule.path.exists() {
t!(fs::create_dir_all(&submodule.path));
}
match submodule.state { match submodule.state {
State::MaybeDirty => { State::MaybeDirty => {
// drop staged changes // drop staged changes
self.run(git().arg("-C").arg(submodule.path).args(&["reset", "--hard"])); self.run(git().current_dir(submodule.path)
.args(&["reset", "--hard"]));
// drops unstaged changes // drops unstaged changes
self.run(git().arg("-C").arg(submodule.path).args(&["clean", "-fdx"])); self.run(git().current_dir(submodule.path)
.args(&["clean", "-fdx"]));
}, },
State::NotInitialized => { State::NotInitialized => {
self.run(git_submodule().arg("init").arg(submodule.path)); self.run(git_submodule().arg("init").arg(submodule.path));
@@ -570,8 +576,10 @@ impl Build {
State::OutOfSync => { State::OutOfSync => {
// drops submodule commits that weren't reported to the (outer) git repository // drops submodule commits that weren't reported to the (outer) git repository
self.run(git_submodule().arg("update").arg(submodule.path)); self.run(git_submodule().arg("update").arg(submodule.path));
self.run(git().arg("-C").arg(submodule.path).args(&["reset", "--hard"])); self.run(git().current_dir(submodule.path)
self.run(git().arg("-C").arg(submodule.path).args(&["clean", "-fdx"])); .args(&["reset", "--hard"]));
self.run(git().current_dir(submodule.path)
.args(&["clean", "-fdx"]));
}, },
} }
} }