Fixes Issue #1071: Deadlock in Submodules when Directory Structure Changes #1070
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
whoisj
changed the title
whoisj
changed the title
| } | ||
| else | ||
| { | ||
| return handle.MarshalAsObjectId(); |
There was a problem hiding this comment.
Couldn't we rather change MarshalAsObjectId to let it handle the (handle.IsZero || handle.IsInvalid) logic? Or are there potential side-effects with this approach?
|
Thanks! Could we put this check in the call to |
@whoisj Have you considered partial staging? This would allow you to only pick changes that you're willing to introduce. |
|
Pushed a simpler change with the same effect. Thanks @nulltoken and @jamill |
nulltoken
added a commit
that referenced
this pull request
Jun 3, 2015
Fixes Issue #1071: Deadlock in Submodules when Directory Structure Changes
|
@whoisj 😍 |
|
Published as NuGet pre-release package |
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.
If the underlying directory structure has changed (deleted, renamed, etc) an invalid handle is correctly returned by Libgit2. Attempting to convert the invalid handle directly into an
ObjectIDresults in an exception being thrown, causing theLazy<ObjectId>.Valuecall to never return, resulting in a deadlock.This fixes that by examining the handle before calling
.MarshalAsObjectId()and returning anullvalue if the handle is invalid.Fixes Issue #1071
PS.
Yes I see the whitespace changes... I've given up in my fight with the Visual Studio auto-formatter, it seems determined to remove those extra