fix(worktrees): ignore generated pre-commit config#252
Merged
Conversation
git-worktree-remove-safe.sh checks ignored files before forcing submodule worktree removal. Generated .pre-commit-config.yaml is expected in clean worktrees and is recreated by the hook sync path, so it should not block cleanup. The filter is exact and leaves every other dirty, untracked, or ignored status line visible to the refusal path. Validation: - nix fmt on scripts/git-worktree-remove-safe.sh - bash -n scripts/git-worktree-remove-safe.sh - nix run nixpkgs#shellcheck on scripts/git-worktree-remove-safe.sh
Bad3r
added
type(fix)
Contributor
|
Claude finished @Bad3r's task in 2m 34s —— View job ReviewNo issues found. |
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: c07e5f4993
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates the require_clean_worktree function in scripts/git-worktree-remove-safe.sh to ignore the .pre-commit-config.yaml file when determining if a worktree is dirty. The review feedback points out that this exclusion should also be applied to submodule status checks to fully achieve the intended goal. Additionally, it is recommended to export LC_ALL=C to ensure consistent Git output parsing across different environments.
The cleanup helper ignored every porcelain status for `.pre-commit-config.yaml`. Worktrees with initialized submodules could pass the preflight check and then hit the fallback `git worktree remove --force` path. That could drop tracked edits reported as ` M .pre-commit-config.yaml` after 66ac9ba removed the tracked config. Keep the exemption limited to `!! .pre-commit-config.yaml` and apply the same filter inside submodule checks. Add a shell regression test for root ignored configs, tracked root edits with submodules, and ignored submodule configs. Validation: - nix fmt --accept-flake-config --no-write-lock-file -- \ scripts/git-worktree-remove-safe.sh tests/git-worktree-remove-safe/run.sh - bash -n scripts/git-worktree-remove-safe.sh \ tests/git-worktree-remove-safe/run.sh - bash tests/git-worktree-remove-safe/run.sh - nix run --accept-flake-config --no-write-lock-file nixpkgs#shellcheck -- \ scripts/git-worktree-remove-safe.sh tests/git-worktree-remove-safe/run.sh - git diff --check
Owner
Author
|
Addressed the valid review feedback in commit ec41260. Accepted and implemented:
Rejected or already satisfied:
Reliability impact:
Validation run:
|
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
Summary
Test plan