Skip to content

resolves #1433 TreeEntry#path should return posix path #1434

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
implausible merged 1 commit into from
Mar 19, 2018
Merged

resolves #1433 TreeEntry#path should return posix path #1434

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion lib/tree_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
var path = require("path");
var path = require("path").posix;
var NodeGit = require("../");
var TreeEntry = NodeGit.TreeEntry;

Expand Down
3 changes: 1 addition & 2 deletions test/tests/tree.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,7 @@ describe("Tree", function() {
var repo = this.repository;
var file1 = "test.txt";
var file2 = "foo/bar.txt";
// index.addByPath doesn't like \s so normalize only for the expected paths
var expectedPaths = [file1, path.normalize(file2)];
var expectedPaths = [file1, file2];
var progressEntries = [];
var endEntries;

Expand Down
4 changes: 2 additions & 2 deletions test/tests/tree_entry.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ describe("TreeEntry", function() {
it("provides the full path", function() {
return this.commit.getEntry("test/raw-commit.js")
.then(function(entry) {
assert.equal(entry.path(), path.normalize("test/raw-commit.js"));
assert.equal(entry.path(), "test/raw-commit.js");
});
});

Expand All @@ -66,7 +66,7 @@ describe("TreeEntry", function() {
var dir = _dir || "",
testPromises = [];
tree.entries().forEach(function(entry) {
var currentPath = path.join(dir, entry.name());
var currentPath = path.posix.join(dir, entry.name());
if (entry.isTree()) {
testPromises.push(
entry.getTree().then(function (subtree) {
Expand Down