development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-08-28 19:59:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #10306 - eholk:git-default-branch, r=alexcrichton

Browse source 
Fix new::git_default_branch with different default

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.
This commit is contained in:
bors 2022-01-19 17:09:36 +00:00
parent 95bb3c92bf 1683cd5eec
commit 7e89966d6c
1 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
tests/testsuite/new.rs
View file

@ -5,11 +5,23 @@ use cargo_test_support::paths;
use std::env;
use std::fs::{self, File};
fn create_empty_gitconfig() {
fn create_default_gitconfig() {
// This helps on Windows where libgit2 is very aggressive in attempting to
// find a git config file.
let gitconfig = paths::home().join(".gitconfig");
File::create(gitconfig).unwrap();
// If we're running this under a user account that has a different default branch set up
// then tests that assume the default branch is master will fail. We set the default branch
// to master explicitly so that tests that rely on this behavior still pass.
fs::write(
paths::home().join(".gitconfig"),
r#"
[init]
defaultBranch = master
"#,
)
.unwrap();
}
#[cargo_test]
@ -471,7 +483,8 @@ or change the name in Cargo.toml with:
#[cargo_test]
fn git_default_branch() {
// Check for init.defaultBranch support.
create_empty_gitconfig();
create_default_gitconfig();
cargo_process("new foo").run();
let repo = git2::Repository::open(paths::root().join("foo")).unwrap();
let head = repo.find_reference("HEAD").unwrap();