-
Notifications
You must be signed in to change notification settings - Fork 611
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
Bump git2
and remove dependency on cmake
#1663
Conversation
Excellent, cmake is the most common cause of build failures for me. I'm actually wondering if we should just drop git2 entirely and subshell out to git now that this is off the web server. The savings from being able to work with a shallow clone likely outweigh the cost of subshelling. |
@bors: r+ |
📌 Commit 044d713 has been approved by |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
☔ The latest upstream changes (presumably #1664) made this pull request unmergeable. Please resolve the merge conflicts. |
The `git2` crate has dropped its dependnecy on `cmake` and we can as well.
Rebased to resolve merge conflicts. @bors r+ |
📌 Commit 7952d3e has been approved by |
Bump `git2` and remove dependency on `cmake` The `git2` crate has dropped its dependnecy on `cmake` and we can as well.
☀️ Test successful - checks-travis |
I didn't realize that |
The
git2
crate has dropped its dependnecy oncmake
and we can aswell.