enable access to git_index_new and add test#820
Closed
petemill wants to merge 1 commit into
Closed
Conversation
Collaborator
|
Can you rebase this on top of master and enable thread safety to see if that fixes the issue please? |
b4f1245 to
f76aaff
Compare
Contributor
Author
|
@johnhaley81 rebased but unfortunately test still fails intermittently (fails more often than succeeds). I ran the tests both with |
Collaborator
a78275a to
206d27d
Compare
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
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.
Test is intermittently failing right now. The new index, which does not have a repository, and only 1 entry added to it, has an entry in a conflict state, but only sometimes when it is run.
When doing
index.conflictGetonly 1 ofours,theirs,basehas the entry we added, the other 2 are null.Not sure why - would appreciate any ideas.