Skip to content

fixes #852 should not be an array with null in it #927

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
johnhaley81 merged 2 commits into from
Feb 29, 2016
Merged

fixes #852 should not be an array with null in it #927

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
a717468
fixes #852 should not be an array with null in it
josh-shaw-dev Feb 29, 2016
1973dfb
fixes #852 fixed tab issue PR #927
josh-shaw-dev Feb 29, 2016
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: 4 additions & 1 deletion lib/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -535,13 +535,16 @@ Repository.prototype.createCommitOnHead = function(
.then(function(treeOid) {
return repo.getHeadCommit()
.then(function(parent) {
if (parent !== null) { // To handle a fresh repo with no commits
parent = [parent];
}
return repo.createCommit(
"HEAD",
author,
committer,
message,
treeOid,
[parent]
parent
);
});
}, callback);
Expand Down
29 changes: 29 additions & 0 deletions test/tests/repository.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,33 @@ describe("Repository", function() {
assert(!commit);
});
});

it("can commit on head on a empty repo with createCommitOnHead", function() {
var fileName = "my-new-file-that-shouldnt-exist.file";
var fileContent = "new file from repository test";
var repo = this.emptyRepo;
var filePath = path.join(repo.workdir(), fileName);
var authSig = repo.defaultSignature();
var commitSig = repo.defaultSignature();
var commitMsg = "Doug this has been commited";

return fse.writeFile(filePath, fileContent)
.then(function() {
return repo.createCommitOnHead(
[filePath],
authSig,
commitSig,
commitMsg
);
})
.then(function(oidResult) {
return repo.getHeadCommit()
.then(function(commit) {
assert.equal(
commit.toString(),
oidResult.toString()
);
});
});
});
});