Use remote update instead of fetch

gnarf · Sep 19, 2012 · a482fea · a482fea
1 parent d17eafa
commit a482fea
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/lib/project.js b/lib/project.js
@@ -25,6 +25,11 @@ function fetch( repoDir, callback ) {
     Git.exec( [ "fetch" ], callback );
 }
 
+function remoteUpdate( repoDir, callback ) {
+    Git( repoDir );
+    Git.exec( [ "remote", "update" ], callback );
+}
+
 function cleanup( project, callback ) {
     var compiled = project.getCompiledDirSync();
 
@@ -214,4 +219,12 @@ Project.prototype.fetch = function( callback ) {
     ], callback );
 }
 
+Project.prototype.remoteUpdate = function( callback ) {
+    async.waterfall([
+        _.bind( this.getRepoDir, this ),
+        remoteUpdate
+    ], callback );
+
+}
+
 module.exports.fetch = fetch;
diff --git a/server.js b/server.js
@@ -108,7 +108,7 @@ app.post( '/post_receive', function ( req, res ) {
 
             if ( project ) {
                 async.series([
-                    _.bind( project.fetch, project ),
+                    _.bind( project.remoteUpdate, project ),
                     _.bind( project.checkout, project )
                 ],
                 function ( err ) {
@@ -137,7 +137,7 @@ app.get( '/v1/:owner/:repo', function ( req, res ) {
 	logger.log( "Fetching " + req.params.owner + "/" + req.params.repo );
     var project = new Project( req.params.owner, req.params.repo );
     async.waterfall([
-        _.bind( project.fetch, project ),
+        _.bind( project.remoteUpdate, project ),
         function ( out ) {
             res.send( ( out?"\n":"" ) + "OK" );
         }