Skip to content

Fix segfault in NodeGit.Revert.revert #1605

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rcjsuen merged 2 commits into from
Jan 16, 2019
Merged

Fix segfault in NodeGit.Revert.revert #1605

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec5f1c9
Don't try to normalize mergeOpts unless mergeOpts is defined.
implausible Dec 20, 2018
d99c327
Add test to prevent regression of Revert.revert options segfault
implausible Jan 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/revert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ Revert.commit = function(
/**
* Reverts the given commit, producing changes in the index and
* working directory.
*
*
* @async
* @param {Repository} repo the repository to perform the revert in
* @param {Commit} commit the commit to revert
Expand All @@ -71,7 +71,7 @@ Revert.revert = function(repo, commit, revertOpts) {

revertOpts = normalizeOptions(revertOpts, NodeGit.RevertOptions);

if (revertOpts) {
if (mergeOpts) {
revertOpts.mergeOpts =
normalizeOptions(mergeOpts, NodeGit.MergeOptions);
}
Expand Down
7 changes: 7 additions & 0 deletions test/tests/revert.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,11 @@ describe("Revert", function() {
throw error;
});
});

it("RevertOptions without MergeOptions should not segfault", function() {
return Revert.revert(test.repository, test.firstCommit, {})
.catch(function(error) {
throw error;
});
});
});