-
Notifications
You must be signed in to change notification settings - Fork 530
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 gix
to the latest released version for bugfixes.
#5657
Conversation
The latest updates on your projects. Learn more about Vercel for Git ↗︎
|
@Byron is attempting to deploy a commit to the GitButler Team on Vercel. A member of the Team first needs to authorize it. |
@krlvi What's happening here with CI is that it fails due to running out of disk space. I have seen this issue before whenever…
The compressed cache here clocks in at 2GB, and uncompressed it's probably even larger, which causes the disk to run out of free space when all the new crate-versions are compiled. A solution would be to delete the shared cache in the admin interface. Alternatively, one could stop sharing caches between PRs. The run with caches removed seems to go through now, which means that deleting the caches should have the same effect. I would then remove fc1e488 to make this PR mergable. |
Thanks. Just busted the caches via the gh cli |
Thanks you! And I just validated that I can do that myself in future, too, I wasn't aware. Now that I have pushed the original state of the branch back up and if CI now passes, this should auto-merge. |
Sorry for the delay, @krlvi, it looks like CI went through and with approval, this PR can be merged. |
The fix include: * ability to find references that are all uppercase. * `tree_merge_options()` now correctly configure rename tracking. - Previously it was deactivated entirely, which would yield worse conflict resolution.
The issue itself seems to be unrelated though.
Rename tracking can help with conflict resolution, but in cases where we only care about detecting conflicts, rename-tracking should be off.
@krlvi and I decided this can wait until after the pending v0.14 release. |
The fix include:
tree_merge_options()
now correctly configure rename tracking.Tasks
git2
tree-diffing, the next big area of oxidisation.v0-rust-unix-rust-testing-v2-f3cec62a-230fc39e
and it should go through.Notes for the Reviewer
[email protected]
works. Otherwise it could be downgraded withcargo update --precise 1.1.16 -p [email protected]
.cargo update
in order to fix a CI failure on Windows that happens in seemingly unrelated dependencies. This could probably be solved by updating only the right dependency, but generally a blanket update is probably more of a benefit than a disadvantage.Even on master, when running
branch status
in the CLI on the gitlab repository, it runs into an error condition.The error originates in this repository, and still happens with this PR, which was to be expected.