Repository navigation
Lock branches held by git state outside the branch list - #7
Merged
Merged
Conversation
git keeps state outside refs/heads that changes what a delete does. The tool did not read it, as with linked worktrees before #6. - A rebase, bisect or rebase --update-refs holds its branches, and git refuses -d and -D on them. They now show ~ and are locked. - r could arm the delete of the wrong remote branch: a protected or default upstream, or origin's branch for a local upstream. It now refuses these and says why. - Remote rows now map back through remote.<name>.fetch. A renaming refspec made the delete remove a teammate's branch of the same short name. Rows that map to no branch, or to more than one, are dropped. - In a partial clone, cherry and diff can fetch, so they get the network timeout. A cherry that fails offline no longer counts as zero risk, so x does not select an unmerged gone branch. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
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.
git keeps state outside
refs/headsthat changes what a delete does. This follows #6 (linked worktrees) with four more cases. Each one was reproduced in a throwaway repo first.rebase --update-refs: git refuses-dand-Don the branches they hold. Those branches now show~and are locked.rwrong target:rcould arm the delete of a protected or default upstream, or oforigin's branch for a local upstream. It now refuses and says why.remote.<name>.fetch. Before, a renaming refspec made the delete remove a teammate's branch.cherryanddiffcan fetch, so they now get the network timeout. Acherrythat fails offline no longer counts as zero risk.Tests: 4 new, 105 in total, passing under
-race. Each new test fails with its fix taken out.🤖 Generated with Claude Code