Skip to content

Commit 57658ec

Browse files
author
John Haley
committed
Fixed some things with Tags being looked up
1 parent deb4966 commit 57658ec

3 files changed

Lines changed: 31 additions & 13 deletions

File tree

generate/descriptor.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,9 @@
127127
"cppClassName": "Array",
128128
"jsClassName": "Array",
129129
"arrayElementCppClassName": "GitCommit"
130+
},
131+
"update_ref": {
132+
"isOptional": true
130133
}
131134
}
132135
},
@@ -1079,6 +1082,13 @@
10791082
"functions": {
10801083
"git_tag_foreach": {
10811084
"ignore": true
1085+
},
1086+
"git_tag_target": {
1087+
"args": {
1088+
"target_out": {
1089+
"isReturn": true
1090+
}
1091+
}
10821092
}
10831093
}
10841094
},

lib/repository.js

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,12 @@ var NodeGit = require("../");
22
var normalizeOid = require("./util/normalize_oid");
33
var Blob = require("./blob");
44
var Tree = require("./tree");
5+
var Tag = require("./tag");
56
var Reference = require("./refs");
67
var Revwalk = require("./revwalk");
78
var Commit = require("./commit");
89
var Remote = require("./remote");
10+
var Promise = require("nodegit-promise");
911

1012
var TreeBuilder = NodeGit.Treebuilder;
1113
var Repository = NodeGit.Repository;
@@ -163,7 +165,7 @@ Repository.prototype.getTag = function(oid, callback) {
163165

164166
var repository = this;
165167

166-
return Reference.lookup(repository, oid).then(function(reference) {
168+
return Tag.lookup(repository, oid).then(function(reference) {
167169
reference.repo = repository;
168170

169171
if (typeof callback === "function") {
@@ -214,21 +216,22 @@ Repository.prototype.createCommit = function(
214216
updateRef, author, committer, message, tree, parents, callback) {
215217

216218
var createCommit = null;
217-
var commit = this;
218219
var repo = this;
219220

220221
if (tree instanceof Tree) {
221-
commit = Commit.create(
222-
repo,
223-
updateRef,
224-
author,
225-
committer,
226-
null /* use default message encoding */,
227-
message,
228-
tree,
229-
parents.length,
230-
parents
231-
);
222+
createCommit = Promise.all([
223+
Commit.create(
224+
repo,
225+
updateRef,
226+
author,
227+
committer,
228+
null /* use default message encoding */,
229+
message,
230+
tree,
231+
parents.length,
232+
parents
233+
)
234+
]);
232235
} else {
233236
createCommit = this.getTree(tree).then(function(tree) {
234237
return Commit.create(

lib/tag.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
var git = require("../");
2+
3+
var Tag = git.Tag;
4+
5+
module.exports = Tag;

0 commit comments

Comments
 (0)