fix: checkout out commits fails during bisect #5157
+96
−3
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
Previously, during git bisect, the '<-- current' marker was based on the BISECT_EXPECTED_REV file, which represents where git bisect expects you to be. If the user manually checked out a different commit during bisect, the UI would still show the bisect-expected commit as current, making it appear as if the checkout didn't work. This change makes the '<-- current' marker reflect where HEAD actually is by using 'git rev-parse HEAD' instead of reading BISECT_EXPECTED_REV. This way, if users manually check out different commits during bisect (e.g., to test commits they expect to fail faster), the UI correctly shows which commit is actually checked out. Fixes jesseduffield#5105 Signed-off-by: majiayu000 <[email protected]>
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.
Fixes #5105
Changes