Skip to content

Fix new::git_default_branch with different default #10306

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 19, 2022
Merged

Fix new::git_default_branch with different default #10306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
40c5139
Fix new::git_default_branch with different default
eholk Jan 18, 2022
1683cd5
Refactor create_empty_config to create_default_config
eholk Jan 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions tests/testsuite/new.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down Expand Up @@ -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();
Expand Down