From d706049488ac1139bb8bfa053c89dc4e7da4e6b4 Mon Sep 17 00:00:00 2001 From: Michael van Engelshoven Date: Fri, 4 Oct 2013 07:15:02 +0200 Subject: [PATCH 1/5] Fixed method names in reference example fixes #98 --- example/general.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/example/general.js b/example/general.js index 2a7baea94..13928c2ac 100644 --- a/example/general.js +++ b/example/general.js @@ -28,7 +28,7 @@ git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) { // **nodegit** uses a simple wrapper around hash values called an `Oid`. // The oid validates that the SHA is well-formed. - var oid = git.Oid.fromString('fd373a561d63bfc0a5665608fe057f2131d81fee'); + var oid = git.Oid.fromString('c27d9c35e3715539d941254f2ce57042b978c49c'); // Most functions in in **nodegit** that take an oid will also take a // string, so for example, you can look up a commit by a string SHA or @@ -175,6 +175,7 @@ git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) { }); }); + // #### Tree Parsing // A Tree is how Git represents the state of the filesystem @@ -315,8 +316,8 @@ git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) { repo.getReference(referenceName, function(error, reference) { if (error) throw error; - if (reference.isOid()) { - console.log("Reference:", referenceName, reference.oid()); + if (reference.isConcrete()) { + console.log("Reference:", referenceName, reference.target()); } else if (reference.isSymbolic()) { console.log("Reference:", referenceName, reference.symbolicTarget()); } From 58f05820ae6219a936dc48efab1b76e127ce0901 Mon Sep 17 00:00:00 2001 From: Michael van Engelshoven Date: Fri, 4 Oct 2013 16:31:15 +0200 Subject: [PATCH 2/5] Fixed wrong variable name. --- lib/object.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/object.js b/lib/object.js index df6300f1b..64c774f84 100644 --- a/lib/object.js +++ b/lib/object.js @@ -18,7 +18,7 @@ git.Object.Type = { * @return {Boolean} */ git.Object.prototype.isCommit = function() { - return this.type() == Object.Type.Commit; + return this.type() == git.Object.Type.Commit; }; /** @@ -26,7 +26,7 @@ git.Object.prototype.isCommit = function() { * @return {Boolean} */ git.Object.prototype.isTree = function() { - return this.type() == Object.Type.Tree; + return this.type() == git.Object.Type.Tree; }; /** @@ -34,7 +34,7 @@ git.Object.prototype.isTree = function() { * @return {Boolean} */ git.Object.prototype.isBlob = function() { - return this.type() == Object.Type.Blob; + return this.type() == git.Object.Type.Blob; }; /** @@ -42,5 +42,5 @@ git.Object.prototype.isBlob = function() { * @return {Boolean} */ git.Object.prototype.isTag = function() { - return this.type() == Object.Type.Tag; + return this.type() == git.Object.Type.Tag; }; From a57309a4fc903750422090afbbf7a008f5e1cfa0 Mon Sep 17 00:00:00 2001 From: Michael van Engelshoven Date: Fri, 4 Oct 2013 16:32:27 +0200 Subject: [PATCH 3/5] Fixed unknown oid for general examples --- example/general.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/general.js b/example/general.js index 13928c2ac..559a42861 100644 --- a/example/general.js +++ b/example/general.js @@ -158,7 +158,7 @@ git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) { // functions very similarly to the commit lookup, parsing and creation // methods, since the objects themselves are very similar. - oid = git.Oid.fromString("97f6d755647aca272e7c8003323472cefca772fc"); + oid = git.Oid.fromString("43f0ac7359e30b769f6b1714e0adbaf51bedbb65"); repo.getTag(oid, function(error, tag) { if (error) throw error; From 3109af8141c72b8100215de29954ff58b27908e0 Mon Sep 17 00:00:00 2001 From: Michael van Engelshoven Date: Fri, 4 Oct 2013 16:40:55 +0200 Subject: [PATCH 4/5] Fixed unknown commit oid --- example/new-commit.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/new-commit.js b/example/new-commit.js index 7fd130931..4bf733c53 100755 --- a/example/new-commit.js +++ b/example/new-commit.js @@ -7,7 +7,7 @@ var git = require('../'), git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) { if (error) throw error; - repo.getCommit('0a70ef1237bc1ea50dbccd395e1a114201b75a68', function(error, commit) { + repo.getCommit('eebd0ead15d62eaf0ba276da53af43bbc3ce43ab', function(error, commit) { if (error) throw error; commit.getTree(function(error, tree) { From 586d25b5809966de7ace6be5deeec8cf3978beaf Mon Sep 17 00:00:00 2001 From: Michael van Engelshoven Date: Sat, 5 Oct 2013 08:56:02 +0200 Subject: [PATCH 5/5] Changed default value of working dir to a existing git folder --- example/apps/git_profanity_check.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/apps/git_profanity_check.js b/example/apps/git_profanity_check.js index 09f0e09db..618eb7a66 100644 --- a/example/apps/git_profanity_check.js +++ b/example/apps/git_profanity_check.js @@ -8,7 +8,7 @@ var git = require('../../'); var curses = ['add', 'swears', 'here'], - path = './.git', + path = '../../.git', branchName = 'master', reCurse = new RegExp('\\b(?:' + curses.join('|') + ')\\b', 'gi');