Skip to content
This repository has been archived by the owner on Aug 1, 2022. It is now read-only.

Point at patched libgit #1895

Merged
merged 1 commit into from
Jun 1, 2021
Merged

Conversation

alexjg
Copy link
Contributor

@alexjg alexjg commented May 19, 2021

This is necessary to use a patched version of libgit which respects the force flag on refspecs. Without this we can lose data when replicating with an out of date peer.

I had to bump the rust-toolchain which triggered a few new lints and changed the name of some older ones so I've had to make some minor changes to the code.

@alexjg alexjg requested a review from a team as a code owner May 19, 2021 14:09
@alexjg alexjg requested a review from a team May 19, 2021 14:09
@FintanH
Copy link
Contributor

FintanH commented May 19, 2021

Does the toolchain need to be on par? 🤔 Or has it run out of space?

@alexjg
Copy link
Contributor Author

alexjg commented May 19, 2021

Looks more like a run-out-of-space error

@FintanH
Copy link
Contributor

FintanH commented May 19, 2021

Looks more like a run-out-of-space error

I'll clear the cache

@alexjg
Copy link
Contributor Author

alexjg commented May 19, 2021

I believe this is now failing due to the changes in the server sent events which are currently merged into master on link and will be fixed by #1758 , I'll get on to fixing the issues in that PR then we can revisit this.

@xla xla marked this pull request as draft May 21, 2021 15:15
geigerzaehler
geigerzaehler previously approved these changes May 27, 2021
@alexjg alexjg marked this pull request as ready for review May 27, 2021 12:54
xla
xla previously approved these changes May 27, 2021
Copy link
Contributor

@xla xla left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🎀 🔣 💤 👸

@alexjg
Copy link
Contributor Author

alexjg commented May 27, 2021

Ugh, code signing, I'll rebase and force push with a signature, at which point I think this will need a bunch more approvals.

@alexjg alexjg dismissed stale reviews from xla and geigerzaehler via cddfdba May 27, 2021 14:52
@alexjg alexjg force-pushed the alexjg/point-at-patched-git branch from 2d02a7a to cddfdba Compare May 27, 2021 14:52
@geigerzaehler
Copy link
Contributor

Looks like the proxy panics on CI.

@alexjg
Copy link
Contributor Author

alexjg commented May 27, 2021

I think that's not a problem, it's just the StreamDiscovery shutting down. It happens for every test but most of them pass. I'm trying to reproduce the problem locally right now.

Also fix a number of clippy lints which were activated by the change
in the rust-toolchain

Signed-off-by: Alex Good <alex@memoryandthought.me>
@geigerzaehler geigerzaehler merged commit 16c0f0c into master Jun 1, 2021
@geigerzaehler geigerzaehler deleted the alexjg/point-at-patched-git branch June 1, 2021 14:31
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants