call 'git update-server-info' after committing via rest api

toolness · Jul 30, 2012 · 9224a50 · 9224a50
1 parent 2fe62ae
commit 9224a50
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/git.js b/git.js
@@ -117,6 +117,12 @@ function Git(options) {
       git(['ls-files', dirname], function(err, stdout) {
         cb(err, stdout.split('\n').slice(0, -1));
       });
+    },
+    end: function(cb) {
+      process.nextTick(function() { cb(null); });
+    },
+    cmd: function(args, cb) {
+      git(args, cb);
     }
   };
 

diff --git a/simple-git-server.js b/simple-git-server.js
@@ -1,7 +1,7 @@
 var _ = require('underscore'),
     express = require('express');
 
-function makeCommitHandler(git) {
+function makeCommitHandler(git, postCommit) {
   return function(req, res) {
     if (!req.user)
       return res.send(403);
@@ -33,7 +33,10 @@ function makeCommitHandler(git) {
     git.commit({
       author: author,
       message: message
-    }, function(err) {
+    });
+    if (postCommit)
+      postCommit(git);
+    git.end(function(err) {
       if (err) {
         if (!err.stderr)
           return res.send('an unknown error occurred', 500);
@@ -61,8 +64,10 @@ module.exports = function SimpleGitServer(config) {
   var self = express.createServer();
 
   self.browserIDCORS = bic;
-  self.handleCommit = makeCommitHandler(git);
   self.handleList = makeListHandler(git);
+  self.handleCommit = makeCommitHandler(git, function postCommit(git) {
+    if (git.cmd) git.cmd(['update-server-info']);
+  });
 
   self.use(express.bodyParser());
   self.use(bic.accessToken);

diff --git a/test/test-git.js b/test/test-git.js
@@ -204,6 +204,7 @@ describe('Git', function() {
       function onRemoveFooTxt(err) {
         if (err) return done(err);
         expect(fs.existsSync(git.abspath('foo.txt'))).to.be(false);
+        expect(fs.existsSync(git.abspath('.git/info/refs'))).to.be(true);
         done();
       }
     });

diff --git a/test/test-simple-git-server.js b/test/test-simple-git-server.js
@@ -18,9 +18,12 @@ describe("SimpleGitServer", function() {
       lastCommitOptions: null,
       addFile: function(f, c) { this.log.push(['add', f, c]); },
       rm: function(f) { this.log.push(['rm', f]); },
-      commit: function(options, cb) {
+      commit: function(options) {
         this.lastCommitOptions = options;
-        this.log.push(['commit']); cb(null);
+        this.log.push(['commit']);
+      },
+      end: function(cb) {
+        cb(null);
       }
     };
   }
@@ -148,7 +151,8 @@ describe("SimpleGitServer", function() {
     request(cfg(SimpleGitServer({
       git: {
         rm: function() {},
-        commit: function(options, cb) { cb("uhoh"); }
+        commit: function() {},
+        end: function(cb) { cb("uhoh"); }
       }
     })))
       .post('/commit')
@@ -161,7 +165,8 @@ describe("SimpleGitServer", function() {
     request(cfg(SimpleGitServer({
       git: {
         rm: function() {},
-        commit: function(options, cb) { cb({stderr: "meh does not exist"}); }
+        commit: function() {},
+        end: function(cb) { cb({stderr: "meh does not exist"}); }
       }
     })))
       .post('/commit')