Delete old tree and write new head on checkout

Author: whyleee

lib/js-git-api.js

@@ -9,6 +9,7 @@ var httpTransport = require('js-git/net/transport-http')(request);
 var fetchPackProtocol = require('js-git/net/git-fetch-pack');
 var modes = require('js-git/lib/modes');
 var archiver = require('archiver');
+var del = require('del');
 var mkdirp = require('mkdirp');
 var ncp = require('ncp').ncp;
 var utils = require('../lib/utils');
@@ -206,8 +207,18 @@ module.exports = {
       return self.readRef(repo, ref, callback);
     });
   },
+  writeHead: function(repo, ref, callback) {
+    var headPath = path.join(repo.rootPath, 'HEAD');
+    if (!this.isHash(ref)) {
+      ref = 'ref: ' + ref;
+    }
+    fs.writeFile(headPath, ref, callback);
+  },
+  isHash: function(str) {
+    return str.match(/^[0-9a-f]{40}$/i);
+  },
   readRef: function(repo, ref, callback) {
-    if (ref.match(/^[0-9a-f]{40}$/i)) {
+    if (this.isHash(ref)) {
       return callback(null, ref);
     }
 
@@ -268,18 +279,33 @@ module.exports = {
 
     function writeTree(err, tree) {
       if (err) return callback(err);
-      if (!tree) return callback();
+      if (!tree) {
+        if (ref) {
+          return self.writeHead(repo, ref, callback);
+        }
+        return callback();
+      }
 
       var repoPath = repo.rootPath;
       if (path.basename(repoPath) == '.git') {
         repoPath = path.dirname(repoPath);
       }
 
-      tree.read(onEntry);
+      del([
+        path.join(repoPath, '*'),
+        '!' + path.join(repoPath, '.git')
+      ], function(err, paths) {
+        tree.read(onEntry);
+      });
 
       function onEntry(err, entry) {
         if (err) return callback(err);
-        if (!entry) return callback();
+        if (!entry) {
+          if (ref) {
+            return self.writeHead(repo, ref, callback);
+          }
+          return callback();
+        }
 
         if (entry.path == '/') {
           return nextEntry();

package.json

@@ -17,6 +17,7 @@
   "dependencies": {
     "archiver": "^0.14.4",
     "commander": "https://github.com/whyleee/commander.js/tarball/master",
+    "del": "^1.2.1",
     "global-tunnel": "https://github.com/whyleee/global-tunnel/tarball/master",
     "ini": "^1.3.4",
     "js-git": "^0.7.7",