@@ -5,50 +5,36 @@
 // Script to detect cursewords in commit messages and provide the
 // offending commit sha's.
 // vim: ft=javascript
-var git = require( 'nodegit' );
+var git = require('../../');
 
-var curses = [ 'add', 'swears', 'here' ]
-  , path = './.git'
-  , branch = 'master'
-  , reCurse = new RegExp('\\b(?:' + curses.join('|') + ')\\b', 'gi');
+var curses = ['add', 'swears', 'here'],
+    path = './.git',
+    branchName = 'master',
+    reCurse = new RegExp('\\b(?:' + curses.join('|') + ')\\b', 'gi');
 
 
-// Set git path
-if ( process.argv.length < 3 ) {
-  console.log( 'No path passed as argument, defaulting to ./.git' );
-}
-else {
+if (process.argv.length < 3) {
+  console.log('No git path passed as argument, defaulting to ./.git');
+} else {
   path = process.argv[2];
 
-  // Set repo branch
-  if ( process.argv.length < 4 ) {
-    console.log( 'No branch passed as argument, defaulting to master' );
-  }
-  else {
-    branch = process.argv[3];
+  if (process.argv.length < 4) {
+    console.log('No repo branchName passed as argument, defaulting to master');
+  } else {
+    branchName = process.argv[3];
   }
 }
 
-// Open repository
-git.repo( path, function( err, repo ) {
-  if ( err ) {
-    throw new Error( err );
-  }
+git.Repo.open(path, function(error, repo) {
+  if (error) throw error;
 
-  // Open branch
-  repo.branch( branch, function( err, branch ) { 
-    if ( err ) {
-      throw new Error( err );
-    }
+  repo.getBranch(branchName, function(error, branch) { 
+    if (error) throw error;
 
-    // Iterate history
     var history = branch.history();
-    history.on( 'commit', function( idx, commit ) {
-      // Check commit messages first
-      if ( reCurse.test(commit.message) ) {
-        console.log( 'Curse detected in commit', commit.sha, 'message' ); 
-        return;
-      }
-    });
+    history.on('commit', function(commit) {
+      if (reCurse.test(commit.message()))
+        console.log('Curse detected in commit', commit.sha(), 'message', commit.message());
+    }).start();
   });
 });
@@ -0,0 +1,35 @@
+var git = require('../'),
+    path = require('path');
+
+// This code examines the diffs between a particular commit and all of its
+// parents. Since this commit is not a merge, it only has one parent. This is
+// similar to doing `git show`.
+
+git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) {
+  if (error) throw error;
+
+  repo.getCommit('59b20b8d5c6ff8d09518454d4dd8b7b30f095ab5', function(error, commit) {
+    if (error) throw error;
+
+    console.log('commit ' + commit.sha());
+    console.log('Author:', commit.author().name() + ' <' + commit.author().email() + '>');
+    console.log('Date:', commit.date());
+    console.log('\n    ' + commit.message());
+
+    commit.getDiff(function(error, diffList) {
+      if (error) throw error;
+
+      diffList.forEach(function(diff) {
+        diff.patches().forEach(function(patch) {
+          console.log("diff", patch.oldFile().path(), patch.newFile().path());
+          patch.hunks().forEach(function(hunk) {
+            console.log(hunk.header().trim());
+            hunk.lines().forEach(function(line) {
+              console.log(String.fromCharCode(line.lineOrigin) + line.content.trim());
+            });
+          });
+        });
+      });
+    });
+  });
+});
@@ -1,4 +1,5 @@
-var git = require('../index.js');
+var git = require('../'),
+    path = require('path');
 
 // **nodegit** is a javascript library for node.js that wraps libgit2, a
 // pure C implementation of the Git core. It provides an asynchronous
@@ -15,7 +16,7 @@ var git = require('../index.js');
 // Nearly, all git operations in the context of a repository.
 // To open a repository,
 
-git.Repo.open('.git', function(error, repo) {
+git.Repo.open(path.resolve(__dirname, '../.git'), function(error, repo) {
   // For all of the following examples, error-handling will be performed in
   // this naive way:  
   if (error) throw error;
@@ -201,7 +202,7 @@ git.Repo.open('.git', function(error, repo) {
 
     // You can also access tree entries by path if you know the path of the
     // entry you're looking for.
-    tree.getFile("example/general.js", function(error, entry) {
+    tree.getEntry("example/general.js", function(error, entry) {
       if (error) throw error;
 
       // Entries which are files have blobs associated with them: