Skip to content

Fix segfault in NodeGit.Revert.revert#1605

Merged
rcjsuen merged 2 commits into
nodegit:masterfrom
implausible:fix/segfault-on-revert-opts-no-merge-opts
Jan 16, 2019
Merged

Fix segfault in NodeGit.Revert.revert#1605
rcjsuen merged 2 commits into
nodegit:masterfrom
implausible:fix/segfault-on-revert-opts-no-merge-opts

Conversation

@implausible
Copy link
Copy Markdown
Member

@implausible implausible commented Dec 20, 2018

Seems we weren't normalizing mergeOpts correctly. Closes #1597

@rcjsuen
Copy link
Copy Markdown
Member

rcjsuen commented Dec 21, 2018

I was able to reproduce the crash and the suggested fix resolves the problem. We should add a test if possible (here or in a separate change).

@rcjsuen rcjsuen merged commit 560eb06 into nodegit:master Jan 16, 2019
@implausible implausible deleted the fix/segfault-on-revert-opts-no-merge-opts branch January 16, 2019 20:15
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.

2 participants