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

Revert "Merge pull request #5400 from kit-ty-kate/no-gpatch" #5891

Merged
merged 1 commit into from
Mar 20, 2024

Conversation

kit-ty-kate
Copy link
Member

@kit-ty-kate kit-ty-kate commented Mar 20, 2024

Reverts #5400

After a couple of weeks of tests, git apply turned out to be bad choice for 2 main reason:

  • the format accepted by it is too strict and will make applications of a number of patches from opam-repository fail. See for example Package slack.0.1 opam-repository#25430 (comment)
  • The --unsafe-paths option is not just used When git apply is used as a "better GNU patch" (as the git documentation puts it), but is actually highly unsafe (who could have guessed!) and allows the application of patches outside of the selected path using ../. However opam requires one part of the behaviour of this option to work: accepting to apply changes inside of a .git directory. This is required for opam update to function properly.

I've also observed some non-deterministic failures but it's harder to understand the reason why.

We have a couple of alternative solutions in mind, but given the critical aspect of those two issues we chose to revert it separately first to give us some more time to implement and choose a better solution.

This reverts commit 321ca42, reversing
changes made to a4a651a.
@kit-ty-kate kit-ty-kate added this to the 2.2.0~beta2 milestone Mar 20, 2024
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.

2 participants