fix: bb format.sh re-staging inside worktrees#23711
Merged
Merged
Conversation
ludamad
approved these changes
May 29, 2026
Collaborator
Flakey Tests🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
danielntmd
pushed a commit
to danielntmd/aztec-packages
that referenced
this pull request
Jun 4, 2026
BEGIN_COMMIT_OVERRIDE docs: restore two-crate testing guidance + /errors/1 anchor (AztecProtocol#23632) feat: txe speedup (AztecProtocol#23578) fix(ci): don't serve cached results for disabled-cache test commands (AztecProtocol#23658) fix(txe): reconcile txe speedup with auth-registry/public-checks demotion (AztecProtocol#23700) feat(aztec-nr)!: remove set_sender_for_tags oracle, use builder pattern for sender override (AztecProtocol#23619) feat!: demote multi_call_entrypoint to non-protocol contract (AztecProtocol#23197) feat(pxe): add class IDs and view context to auth request (AztecProtocol#23633) fix: bb format.sh re-staging inside worktrees (AztecProtocol#23711) feat!: shift remaining protocol-contract addresses to 1-3 (AztecProtocol#23218) feat(standard-contracts): show expected-vs-actual diff in drift error (AztecProtocol#23710) feat(standard-contracts): add v4-style pin-build mechanism for standard contracts (AztecProtocol#23262) END_COMMIT_OVERRIDE
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
3 participants
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.
Problem
.git/hooks/pre-commitrunsbarretenberg/cpp/format.sh staged, which lists staged C++ files withgit diff-index --relative --cachedand re-git adds them after clang-format. Git setsGIT_DIRto an absolute path when invoking hooks; inside a worktree that makes--relativeresolve against the wrong root, so the re-add runsgit addon a path that is in the index but does not exist at the expected location — which stages a deletion. Committing inside a worktree therefore silently drops staged.cpp/.hppfiles from the tree. Hit in practice when a merge that touched 34 barretenberg C++ files committed them away.Fix
unset GIT_DIRnear the top offormat.sh, so the relative paths resolve against the worktree root. Same bug and one-liner fix as #22557 (yarn-project/precommit.sh) and #23628 (noir-projects/precommit.sh);format.shis the last pre-commit hook script that still had it.