Merge branch 'master' of github.com:gabrielcsapo/node-git-server

gabrielcsapo · Nov 27, 2018 · 4c974e3 · 4c974e3
2 parents dd20baf + f19a1c1
commit 4c974e3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/lib/service.js b/lib/service.js
@@ -1,6 +1,7 @@
 const through = require('through');
 const zlib = require('zlib');
 const util = require('util');
+const os = require('os');
 const { spawn } = require('child_process');
 
 const HttpDuplex = require('./http-duplex');
@@ -103,7 +104,11 @@ class Service extends HttpDuplex {
 
     self.once('accept', function onAccept() {
         process.nextTick(function() {
-            const cmd = ['git-' + opts.service, '--stateless-rpc', opts.cwd];
+            const cmd = os.platform() == 'win32' ?
+              ['git', opts.service, '--stateless-rpc', opts.cwd]
+            :
+              ['git-' + opts.service, '--stateless-rpc', opts.cwd];
+
             const ps = spawn(cmd[0], cmd.slice(1));
 
             ps.on('error', function(err) {

diff --git a/lib/util.js b/lib/util.js
@@ -84,7 +84,14 @@ const Util = {
       res.write(pack('# service=git-' + service + '\n'));
       res.write('0000');
 
-      const cmd = ['git-' + service, '--stateless-rpc', '--advertise-refs', repoLocation];
+      var cmd = null;
+      var isWin = /^win/.test(process.platform);
+      if (isWin) {
+          cmd = ['git', service, '--stateless-rpc', '--advertise-refs', repoLocation];
+      } else {
+          cmd = ['git-' + service, '--stateless-rpc', '--advertise-refs', repoLocation];
+      }
+
       const ps = spawn(cmd[0], cmd.slice(1));
       ps.on('error', (err) => {
           dup.emit('error', new Error(`${err.message} running command ${cmd.join(' ')}`));