Fix new::git_default_branch with different default #10306
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The test new::git_default_branch would fail if the current user had already configured a different default branch. This patch changes the test to first write a .gitconfig file with the default branch set to master. This puts us in a state where we still have the old default, and then the subsequent change to the config file will make sure that config changes are still respected.
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @ehuss (or someone else) soon. Please see the contribution instructions for more information. |
weihanglo
reviewed
Jan 19, 2022
|
@bors: r+ 👍 |
|
📌 Commit 1683cd5 has been approved by |
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 26, 2022
Update cargo 9 commits in 95bb3c92bf516017e812e7f1c14c2dea3845b30e..1c034752de0df744fcd7788fcbca158830b8bf85 2022-01-18 17:39:35 +0000 to 2022-01-25 22:36:53 +0000 - Sync toml_edit versions (rust-lang/cargo#10329) - Check --config for dotted keys only (rust-lang/cargo#10176) - Remove deprecated --host arg for search and publish cmds (rust-lang/cargo#10327) - doc: it's valid to use OUT_DIR for intermediate artifacts (rust-lang/cargo#10326) - Use local git info for version. (rust-lang/cargo#10323) - Fix documenting with undocumented dependencies. (rust-lang/cargo#10324) - do not compile test for bins flagged as `test = false` (rust-lang/cargo#10305) - Port cargo from toml-rs to toml_edit (rust-lang/cargo#10086) - Fix new::git_default_branch with different default (rust-lang/cargo#10306)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The test
new::git_default_branchwould fail if the current user had already configured a different default branch.This patch changes the test to first write a
.gitconfigfile with the default branch set to master. This puts us in a state where we still have the old default, and then the subsequent change to the config file will make sure that config changes are still respected.