Skip to content

Commit

Permalink
Rollup merge of rust-lang#127919 - Kobzol:fix-git-command, r=onur-ozkan
Browse files Browse the repository at this point in the history
Allow a git command for getting the current branch in bootstrap to fail

Found by `@lukas-code` [here](rust-lang#127680 (comment)). The bug was introduced in rust-lang#127680 (before, the command was allowed to fail).

r? `@onur-ozkan`
  • Loading branch information
matthiaskrgr authored Jul 18, 2024
2 parents ac26f6a + 4dc8e66 commit 6c10822
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions src/bootstrap/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -535,6 +535,7 @@ impl Build {
// even though that has no relation to the upstream for the submodule.
let current_branch = helpers::git(Some(&self.src))
.capture_stdout()
.allow_failure()
.run_always()
.args(["symbolic-ref", "--short", "HEAD"])
.run(self)
Expand Down

0 comments on commit 6c10822

Please sign in to comment.