This repository has been archived by the owner on Dec 15, 2022. It is now read-only.
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.
git/git@27344d6 has finally landed in Git 2.15.0 and in Dugite 1.49.0! This updates dependencies as appropriate, utilizes the new option via the
GIT_OPTIONAL_LOCKS
environment variable, and removesDeferredCallbackQueue
(as it was introduced to help alleviate index lock contention in #726).I verified this on my own computer using this test plan:
atom -d .
export EDITOR="atom -d --wait"
git rebase -i head~5
r
to rewrite the commit message.Prior to this PR, the rebase would immediately stop, because the window opened in step 1 would receive focus and run
status
, locking the index. After this PR, I was able to edit multiple commit messages with no problems. 🎉Fixes #961
Fixes akonwi/git-plus#693
Ref platformio/platformio-atom-ide-terminal#297 (may fix some reported issues)