Couldn't sleep until I made OpenAfterWork call its callback with error, object like *all* the other async methods.

faceleg · faceleg · commit 7a1975474b94 · 2013-03-13T22:36:16.000+13:00
diff --git a/lib/repo.js b/lib/repo.js
@@ -13,11 +13,12 @@ exports.repo = function(directory, callback) {
     if (!callback || typeof callback !== 'function') {
       throw new Error('If directory is provided, callback function is required');
     }
-    self.repo.open(directory, function(error) {
+    self.repo.open(directory, function(error, rawRepo) {
       if (error) {
         callback(git.error(error), null);
         return;
       }
+      self.repo = rawRepo;
       callback(null, self);
     });
   }
diff --git a/src/repo.cc b/src/repo.cc
@@ -95,22 +95,34 @@ void GitRepo::OpenAfterWork(uv_work_t *req) {
   OpenBaton *baton = static_cast<OpenBaton *>(req->data);
   delete req;
 
-  baton->repo->SetValue(baton->rawRepo);
   baton->repo->Unref();
 
-  Local<Value> argv[1];
   if (baton->error) {
-    argv[0] = GitError::WrapError(baton->error);
+    Local<Value> argv[1] = {
+      GitError::WrapError(baton->error)
+    };
+
+    TryCatch try_catch;
+
+    baton->callback->Call(Context::GetCurrent()->Global(), 1, argv);
+
+    if (try_catch.HasCaught()) {
+      node::FatalException(try_catch);
+    }
   } else {
-    argv[0] = Local<Value>::New(Null());
-  }
 
-  TryCatch try_catch;
+    baton->repo->SetValue(baton->rawRepo);
 
-  baton->callback->Call(Context::GetCurrent()->Global(), 1, argv);
+    Handle<Value> argv[2] = {
+      Local<Value>::New(Null()),
+      baton->repo->handle_
+    };
 
-  if (try_catch.HasCaught()) {
+    TryCatch try_catch;
+    baton->callback->Call(Context::GetCurrent()->Global(), 2, argv);
+    if (try_catch.HasCaught()) {
       node::FatalException(try_catch);
+    }
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -13,11 +13,12 @@ exports.repo = function(directory, callback) {`
`13`	`13`	`if (!callback \|\| typeof callback !== 'function') {`
`14`	`14`	`throw new Error('If directory is provided, callback function is required');`
`15`	`15`	`}`
`16`		`- self.repo.open(directory, function(error) {`
	`16`	`+ self.repo.open(directory, function(error, rawRepo) {`
`17`	`17`	`if (error) {`
`18`	`18`	`callback(git.error(error), null);`
`19`	`19`	`return;`
`20`	`20`	`}`
	`21`	`+ self.repo = rawRepo;`
`21`	`22`	`callback(null, self);`
`22`	`23`	`});`
`23`	`24`	`}`