fix: libgit2 branch checkout to avoid half-switched HEAD#332
Merged
Dimillian merged 1 commit intoDimillian:mainfrom Feb 4, 2026
Merged
Conversation
d907a4b to
bda70ac
Compare
Owner
|
@codex review |
|
Codex Review: Didn't find any major issues. Keep them coming! ℹ️ About Codex in GitHubYour team has set up Codex to review pull requests in this repo. Reviews are triggered when you
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". |
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
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
When
checkout_branchencountered an error (e.g., dirty working tree conflicts or missing target branch), the repository could be left in an inconsistent state with HEAD pointing to a branch that was never actually checked out.This happened because the previous implementation called
set_head()beforecheckout_head(). If the checkout failed, HEAD was already updated, leaving the repo in a half-switched state.Solution
Reorder the libgit2 operations:
revparse_single()checkout_tree()to switch the working directoryset_head()after a successful checkoutThis ensures HEAD is never updated unless the checkout succeeds, making the operation atomic from the user's perspective.
How to Reproduce (Before Fix)
Cmd+B) to switch branchesgit statusmay show you on the new branch but with the old tree, or vice versaAlternatively:
Testing
Added a unit test
checkout_branch_missing_does_not_change_headthat: