Changed v0.18.0.json so diffWorkDir DiffOptions argument is optional. Added .idea to .gitignore to support webstorm.

kmctown · kmctown · commit 19211752b6c6 · 2013-10-07T10:28:06.000-04:00
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@
 /out
 /test.git
 /test/.reposCache
+.idea
diff --git a/src/tree.cc b/src/tree.cc
@@ -536,9 +536,6 @@ Handle<Value> GitTree::DiffWorkDir(const Arguments& args) {
       if (args.Length() == 0 || !args[0]->IsObject()) {
     return ThrowException(Exception::Error(String::New("Repository repo is required.")));
   }
-  if (args.Length() == 1 || !args[1]->IsObject()) {
-    return ThrowException(Exception::Error(String::New("DiffOptions opts is required.")));
-  }
 
   if (args.Length() == 2 || !args[2]->IsFunction()) {
     return ThrowException(Exception::Error(String::New("Callback is required and must be a Function.")));
@@ -556,8 +553,12 @@ Handle<Value> GitTree::DiffWorkDir(const Arguments& args) {
   baton->old_tree = ObjectWrap::Unwrap<GitTree>(args.This())->GetValue();
   baton->optsReference = Persistent<Value>::New(args[1]);
     const git_diff_options * from_opts;
+      if (args[1]->IsObject()) {
             from_opts = ObjectWrap::Unwrap<GitDiffOptions>(args[1]->ToObject())->GetValue();
-          baton->opts = from_opts;
+          } else {
+      from_opts = 0;
+    }
+      baton->opts = from_opts;
     baton->callback = Persistent<Function>::New(Local<Function>::Cast(args[2]));
 
   uv_queue_work(uv_default_loop(), &baton->request, DiffWorkDirWork, (uv_after_work_cb)DiffWorkDirAfterWork);
diff --git a/v0.18.0.json b/v0.18.0.json
@@ -17064,6 +17064,7 @@
             "cType": "const git_diff_options *",
             "cppClassName": "GitDiffOptions",
             "jsClassName": "DiffOptions",
+            "isOptional": true,
             "comment": "Structure with options to influence diff or NULL for defaults."
           }
         ],

Original file line number	Diff line number	Diff line change
`@@ -17064,6 +17064,7 @@`
`17064`	`17064`	`"cType": "const git_diff_options *",`
`17065`	`17065`	`"cppClassName": "GitDiffOptions",`
`17066`	`17066`	`"jsClassName": "DiffOptions",`
	`17067`	`+ "isOptional": true,`
`17067`	`17068`	`"comment": "Structure with options to influence diff or NULL for defaults."`
`17068`	`17069`	`}`
`17069`	`17070`	`],`