Ensure remoteCallbacks aren't initialized as an object

tbranyen · tbranyen · commit 22afe878e511 · 2014-10-23T10:47:34.000-04:00
diff --git a/lib/clone.js b/lib/clone.js
@@ -12,8 +12,11 @@ var clone = Clone.clone;
  * @param options
  */
 Clone.clone = function(url, local_path, options) {
+  var remoteCallbacks = options.remoteCallbacks;
+  delete options.remoteCallbacks;
   options = normalizeOptions(options, NodeGit.CloneOptions);
-  options.remoteCallbacks = normalizeOptions(options.remoteCallbacks,
+
+  options.remoteCallbacks = normalizeOptions(remoteCallbacks,
     NodeGit.RemoteCallbacks);
 
   return clone.call(this, url, local_path, options);
diff --git a/lib/util/normalize_options.js b/lib/util/normalize_options.js
@@ -5,7 +5,7 @@
  * @return {Object} An Oid instance.
  */
 function normalizeOptions(options, Ctor) {
-  var instance = new Ctor();
+  var instance = options instanceof Ctor ? options : new Ctor();
 
   if (!options) {
     return null;
