Merge pull request #1722 from implausible/fix/optional-parameter-on-u…

…pdate-tips updateTips: optional param and normalizeOptions
nodegit · Sep 13, 2019 · 372635a · 372635a
2 parents 0228707 + cd55298
commit 372635a
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/generate/input/descriptor.json b/generate/input/descriptor.json
@@ -3300,6 +3300,11 @@
         },
         "git_remote_update_tips": {
           "isAsync": true,
+          "args": {
+            "reflog_message": {
+              "isOptional": true
+            }
+          },
           "return": {
             "isErrorCode": true
           }

diff --git a/lib/remote.js b/lib/remote.js
@@ -11,6 +11,7 @@ var _createWithOpts = Remote.createWithOpts;
 var _download = Remote.prototype.download;
 var _fetch = Remote.prototype.fetch;
 var _push = Remote.prototype.push;
+var _updateTips = Remote.prototype.updateTips;
 var _upload = Remote.prototype.upload;
 
 /**
@@ -146,6 +147,40 @@ Remote.prototype.fetch = function(refspecs, opts, reflog_message) {
     .call(this, refspecs, normalizeFetchOptions(opts), reflog_message);
 };
 
+/**
+ * Update the tips to the new state
+ * @param {RemoteCallbacks} callbacks The callback functions for the connection
+ * @param {boolean} updateFetchhead whether to write to FETCH_HEAD. Pass true
+ *                                  to behave like git.
+ * @param {boolean} downloadTags what the behaviour for downloading tags is
+ *                               for this fetch. This is ignored for push.
+ *                               This must be the same value passed to
+ *                               Remote.prototype.download
+ * @param {string} reflogMessage The message to insert into the reflogs. If
+ *                               null and fetching, the default is "fetch ",
+ *                               where is the name of the remote (or its url,
+ *                               for in-memory remotes). This parameter is
+ *                               ignored when pushing.
+ */
+Remote.prototype.updateTips = function(
+  callbacks,
+  updateFetchhead,
+  downloadTags,
+  reflogMessage
+) {
+  if (callbacks) {
+    callbacks = normalizeOptions(callbacks, NodeGit.RemoteCallbacks);
+  }
+
+  return _updateTips.call(
+    this,
+    callbacks,
+    updateFetchhead,
+    downloadTags,
+    reflogMessage
+  );
+};
+
 /**
  * Pushes to a remote
  *
@@ -184,7 +219,6 @@ Remote.prototype.upload = function(refSpecs, opts) {
   return _upload.call(this, refSpecs, opts);
 };
 
-
 NodeGit.Remote.COMPLETION_TYPE = {};
 var DEPRECATED_STATES = {
   COMPLETION_DOWNLOAD: "DOWNLOAD",