Git rebase detection #57651
Merged
Git rebase detection #57651
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
|
I plan to squash this, but I thought seeing the test setup script might be helpful for review. |
|
Fixes #57299 |
|
Thanks! 🍻 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
I'm not sure how sensitive vscode needs to be about file i/o. The bug here is that rebase detection was unaware that if the rebase directory is missing, there is no rebase in progress. I added a couple of async
fs.existscalls parallel to the existing code that reads the rebase commit hash. If we think it is far more common that the user is not dealing with a rebase collision, we may want to optimize around that. We could wait until after successfully reading the hash before checking for the rebase directories. I believe that would make it slightly slower in the less common case in which a rebase is happening.A completely different option would be to read the commit hash from one of the rebase folders and forego the
REBASE_HEADfile.