Skip to content

enable access to git_index_new and add test#820

Closed
petemill wants to merge 1 commit into
nodegit:masterfrom
petemill:index-create
Closed

enable access to git_index_new and add test#820
petemill wants to merge 1 commit into
nodegit:masterfrom
petemill:index-create

Conversation

@petemill

@petemill petemill commented Dec 9, 2015

Copy link
Copy Markdown
Contributor

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.conflictGet only 1 of ours, theirs, base has the entry we added, the other 2 are null.

Not sure why - would appreciate any ideas.

@johnhaley81

Copy link
Copy Markdown
Collaborator

Can you rebase this on top of master and enable thread safety to see if that fixes the issue please?

@petemill

Copy link
Copy Markdown
Contributor Author

@johnhaley81 rebased but unfortunately test still fails intermittently (fails more often than succeeds).

I ran the tests both with NODEGIT_TEST_THREADSAFETY=true and with NodeGit.enableThreadSafety() explicitly inside the test. Fails on both occasions with Index should not have conflicts.

@johnhaley81

Copy link
Copy Markdown
Collaborator

@petemill Alright! Let's try this again. Can you rebase on top of #971 and see if that helps?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants