Enable git fetch again

Which got removed in FredrikNoren@3b8b973
campersau · Oct 2, 2024 · dc85031 · dc85031
1 parent a22f2e2
commit dc85031
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 13 deletions.
diff --git a/components/remotes/remotes.js b/components/remotes/remotes.js
@@ -47,15 +47,26 @@ class RemotesViewModel {
   }
 
   async fetch(options) {
-    if (!this.currentRemote() || !options.tags) return;
+    if (!this.currentRemote()) return;
     ungit.logger.debug('remotes.fetch() triggered');
 
     try {
-      const tagPromise = this.server.getPromise('/remote/tags', {
-        path: this.repoPath(),
-        remote: this.currentRemote(),
-      });
-      programEvents.dispatch({ event: 'remote-tags-update', tags: await tagPromise });
+      const tagPromise = options.tags
+        ? this.server.getPromise('/remote/tags', {
+            path: this.repoPath(),
+            remote: this.currentRemote(),
+          })
+        : null;
+      const fetchPromise = options.nodes
+        ? this.server.getPromise('/fetch', { path: this.repoPath(), remote: this.currentRemote() })
+        : null;
+
+      if (tagPromise) {
+        programEvents.dispatch({ event: 'remote-tags-update', tags: await tagPromise });
+      }
+      if (fetchPromise) {
+        await fetchPromise;
+      }
       if (!this.server.isInternetConnected) {
         this.server.isInternetConnected = true;
       }

diff --git a/source/git-api.js b/source/git-api.js
@@ -293,7 +293,7 @@ exports.registerApi = (env) => {
     }
   );
 
-  app.post(
+  app.get(
     `${exports.pathPrefix}/fetch`,
     ensureAuthenticated,
     ensurePathExists,
@@ -303,18 +303,18 @@ exports.registerApi = (env) => {
       if (res.setTimeout) res.setTimeout(tenMinTimeoutMs);
 
       const task = gitPromise({
-        commands: credentialsOption(req.body.socketId, req.body.remote).concat([
+        commands: credentialsOption(req.query.socketId, req.query.remote).concat([
           'fetch',
           config.autoPruneOnFetch ? '--prune' : '',
           '--',
-          req.body.remote,
-          req.body.ref ? req.body.ref : '',
+          req.query.remote,
+          req.query.ref ? req.query.ref : '',
         ]),
-        repoPath: req.body.path,
+        repoPath: req.query.path,
         timeout: tenMinTimeoutMs,
       });
 
-      jsonResultOrFailProm(res, task).finally(emitGitDirectoryChanged.bind(null, req.body.path));
+      jsonResultOrFailProm(res, task).finally(emitGitDirectoryChanged.bind(null, req.query.path));
     }
   );
 

diff --git a/test/spec.git-api.remote.js b/test/spec.git-api.remote.js
@@ -131,7 +131,7 @@ describe('git-api remote', function () {
   });
 
   it('fetching in "local2" should work', () => {
-    return common.post(req, '/fetch', { path: testDirLocal2, remote: 'origin' });
+    return common.get(req, '/fetch', { path: testDirLocal2, remote: 'origin' });
   });
 
   it('log in "local2" should show the branch as one behind', () => {