Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions generate/input/descriptor.json
Original file line number Diff line number Diff line change
Expand Up @@ -1605,6 +1605,11 @@
}
}
},
"strarray": {
"dependencies": [
"../include/str_array_converter.h"
]
},
"stream": {
"ignore": true,
"cDependencies": [
Expand Down
2 changes: 1 addition & 1 deletion generate/templates/partials/field_accessors.cc
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@

NanAssignPersistent(wrapper->{{ field.name }}, {{ field.name }});

wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}ObjectWrap::Unwrap<{{ field.cppClassName }}>({{ field.name }}->ToObject())->GetValue();
wrapper->raw->{{ field.name }} = {% if not field.cType | isPointer %}*{% endif %}{% if field.cppClassName == 'GitStrarray' %}StrArrayConverter::Convert({{ field.name }}->ToObject()){% else %}ObjectWrap::Unwrap<{{ field.cppClassName }}>({{ field.name }}->ToObject())->GetValue(){% endif %};

{% elsif field.isCallbackFunction %}
if (wrapper->{{ field.name }} != NULL) {
Expand Down
41 changes: 41 additions & 0 deletions test/tests/checkout.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,19 @@
var assert = require("assert");
var path = require("path");
var fse = require("fs-extra");
var local = path.join.bind(path, __dirname);

describe("Checkout", function() {
var NodeGit = require("../../");
var Repository = NodeGit.Repository;
var Checkout = NodeGit.Checkout;

var readMeName = "README.md";
var packageJsonName = "package.json";
var packageJsonOid = "0fa56e90e096a4c24c785206b826ab914ea3de1e";
var reposPath = local("../repos/workdir");
var readMePath = local("../repos/workdir/" + readMeName);
var packageJsonPath = local("../repos/workdir/" + packageJsonName);

beforeEach(function() {
var test = this;
Expand All @@ -33,6 +38,42 @@ describe("Checkout", function() {
});
});

it("can force checkout a single file", function() {
var test = this;

var packageContent = fse.readFileSync(packageJsonPath, "utf-8");
var readmeContent = fse.readFileSync(readMePath, "utf-8");

assert.notEqual(packageContent, "");
assert.notEqual(readmeContent, "");

fse.outputFileSync(readMePath, "");
fse.outputFileSync(packageJsonPath, "");

var opts = {
checkoutStrategy: Checkout.STRATEGY.FORCE,
paths: packageJsonName
};

return Checkout.head(test.repository, opts)
.then(function() {
var resetPackageContent = fse.readFileSync(packageJsonPath, "utf-8");
var resetReadmeContent = fse.readFileSync(readMePath, "utf-8");

assert.equal(resetPackageContent, packageContent);
assert.equal(resetReadmeContent, "");

var resetOpts = {
checkoutStrategy: Checkout.STRATEGY.FORCE
};

return Checkout.head(test.repository, resetOpts);
}).then(function() {
var resetContent = fse.readFileSync(readMePath, "utf-8");
assert.equal(resetContent, readmeContent);
});
});

it("can checkout by tree", function() {
var test = this;

Expand Down