fix: patchable worktree initialization #977
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
github-merge-queue bot
pushed a commit
that referenced
this pull request
Feb 17, 2025
* Add authorship information to Druid 26.0.0 patches * Add patchable checkout script * Add patchable export script, convert Druid 26.0.0 patches to patchable * Scrub commit IDs * Remove patch count from header * Add test patches * Rebase in test patch * Add docs * fix: patchable worktree initialization (#977) * Start rewriting patchable in Rust * Logging * Fix broken initial checkout * Fetch commits individually from upstream instead of cloning * Make commit IDs deterministic * Reimplement git-am for better determinism * Mailsplit each patch file separately * Simplify worktree checkout logic a bit * Forward logging from libgit2 * Normalize commits before exporting * Factor out implementation details from main() * Modularize * Start handling errors * Factor out patch mail parsing * More error handling * Snafuize the remaining errors * Shrink the error types a bit * Move patchable to rust/patchable for consistency * Docs * Remove obsolete patchable.nu * Add patchable init * Enforce that base must be a commit ID in patchable.toml * Ensure that init always fetches base from upstream * Print worktree directory on checkout Also move logs to stderr to avoid confusion * Document how to rebase patch series * Remove dummy patches * Documentation and cleanup * Remove git version suffix from patches * Skip comments in series file * Document how to import invalid patch series into patchable * More documentation * Add openssl to shell.nix * Reword docs following @soenkeliebau's comments #1003 (comment) * Then begone * Changelog * Fix gitignore EOLs * Update README.md Co-authored-by: Nick <[email protected]> * Update README.md Co-authored-by: Nick <[email protected]> * Fix FMPP update patch metadata --------- Co-authored-by: Lukas Krug <[email protected]> Co-authored-by: Nick <[email protected]>
dervoeti
added a commit
that referenced
this pull request
Feb 26, 2025
* Add authorship information to Druid 26.0.0 patches * Add patchable checkout script * Add patchable export script, convert Druid 26.0.0 patches to patchable * Scrub commit IDs * Remove patch count from header * Add test patches * Rebase in test patch * Add docs * fix: patchable worktree initialization (#977) * Start rewriting patchable in Rust * Logging * Fix broken initial checkout * Fetch commits individually from upstream instead of cloning * Make commit IDs deterministic * Reimplement git-am for better determinism * Mailsplit each patch file separately * Simplify worktree checkout logic a bit * Forward logging from libgit2 * Normalize commits before exporting * Factor out implementation details from main() * Modularize * Start handling errors * Factor out patch mail parsing * More error handling * Snafuize the remaining errors * Shrink the error types a bit * Move patchable to rust/patchable for consistency * Docs * Remove obsolete patchable.nu * Add patchable init * Enforce that base must be a commit ID in patchable.toml * Ensure that init always fetches base from upstream * Print worktree directory on checkout Also move logs to stderr to avoid confusion * Document how to rebase patch series * Remove dummy patches * Documentation and cleanup * Remove git version suffix from patches * Skip comments in series file * Document how to import invalid patch series into patchable * More documentation * Add openssl to shell.nix * Reword docs following @soenkeliebau's comments #1003 (comment) * Then begone * Changelog * Fix gitignore EOLs * Update README.md Co-authored-by: Nick <[email protected]> * Update README.md Co-authored-by: Nick <[email protected]> * Fix FMPP update patch metadata --------- Co-authored-by: Lukas Krug <[email protected]> Co-authored-by: Nick <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Running patchable for the first time failed on my machine with the error:
It looks like
git rev-parse --git-dirthrows this error because the worktree directory is not present yet in my case.