Skip to content

Conversation

@jgbright
Copy link
Contributor

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.exists calls 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_HEAD file.

@jgbright
Copy link
Contributor Author

I plan to squash this, but I thought seeing the test setup script might be helpful for review.

@jgbright
Copy link
Contributor Author

Fixes #57299

@joaomoreno joaomoreno added this to the Backlog milestone Aug 31, 2018
@joaomoreno joaomoreno added the git GIT issues label Aug 31, 2018
@joaomoreno joaomoreno merged commit 86230c2 into microsoft:master Sep 13, 2018
@joaomoreno joaomoreno modified the milestones: Backlog, September 2018 Sep 13, 2018
@joaomoreno
Copy link
Member

Thanks! 🍻

@github-actions github-actions bot locked and limited conversation to collaborators Mar 27, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

git GIT issues

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants