Workaround reflog corruption bug in git 2.48 #139
Merged
Conversation
This file contains 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
In git 2.48, there is an issue where using `git update-ref` add a new entry to the reflog for a branch will cause corrupted reflog entries to be created for any symbolic refs referencing the updated reference. This impacts most usage of `git-revise`, as we update the default `HEAD` reference indirectly due to using `git rev-parse --symbolic-full-name` to resolve the identity of a branch. This patch works around this issue in the common case by checking if the given name directly names a valid ref or symbolic ref, skipping the `--symbolic-full-name` resolution if it does. This means that HEAD will be directly updated by `git update-ref`, and receive valid reflog entries. This workaround shouldn't negatively impact other git versions, and is largely an internal change to how symbolic refs are handled by the odb.Reference type. See #138 for details.
Manishearth
approved these changes
Jan 23, 2025
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.
In git 2.48, there is an issue where using
git update-refadd a new entry to the reflog for a branch will cause corrupted reflog entries to be created for any symbolic refs referencing the updated reference. This impacts most usage ofgit-revise, as we update the defaultHEADreference indirectly due to usinggit rev-parse --symbolic-full-nameto resolve the identity of a branch.This patch works around this issue in the common case by checking if the given name directly names a valid ref or symbolic ref, skipping the
--symbolic-full-nameresolution if it does. This means that HEAD will be directly updated bygit update-ref, and receive valid reflog entries.This workaround shouldn't negatively impact other git versions, and is largely an internal change to how symbolic refs are handled by the odb.Reference type.
See #138 for details.