Skip to content
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.

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

Update to libgit2 v1.1 and use main branch for tests. #627

Merged
merged 2 commits into from
Oct 14, 2020

Conversation

de-vri-es
Copy link
Contributor

@de-vri-es de-vri-es commented Oct 13, 2020

This PR updates the libgit2 submodule to the v1.1.0 tag. It also updates the unit tests to use a fixed name for the HEAD of created test repositories.

Since libgit2 1.1.0, the gitconfig of the environment can change the name of the default branch. If the test do not specify a fixed name for the initial HEAD, they will fail on some systems with different configuration.

To make sure I didn't miss anything, I ran the tests this with init.defaultBranch in my gitconfig set to a value different from both master and main.

As a bonus, this PR also replaces master with main in documentation and examples of the git2 crate.

This should automatically address rust-lang/cargo/issues/8588 once cargo updates the dependency on this crate.

@ehuss
Copy link
Contributor

ehuss commented Oct 13, 2020

Thanks! I think the version will also need to be bumped (similar to 218a2b3).

@alexcrichton
Copy link
Member

I'm gonna go ahead and merge this and I'll do the version bumps as a follow-up commit for a release.

@alexcrichton alexcrichton merged commit 6880563 into rust-lang:master Oct 14, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants