Merge branch 'mkw/treeish' into civitas-patched

Author: mkw

lib/git/commands.js

@@ -48,12 +48,42 @@ exports.tag = function(version, message, cwd, cb) {
   run_command('git tag -a "' + version + '" -m "' + message + '"', cwd, cb);
 };
 
-exports.checkout_branch = function(branch_name, cwd, cb) {
-  run_command('git checkout -b ' + branch_name, cwd, cb);
+exports.checkout_treeish = function(treeish_name, cwd, cb) {
+  // See what branch we are on
+  run_command('git symbolic-ref --quiet --short HEAD', cwd, function(err, current_branch) {
+    if (err) {
+      // If we are not on a branch, this will error out, but ignore it
+      logger.debug('Repo is not currently on a branch: %s', cwd);
+    }
+
+    // If the selected name is the current branch, just check it out.
+    if (current_branch === treeish_name) {
+      // We are checking out the current branch, so just checkout.
+      run_command('git checkout ' + treeish_name, cwd, cb);
+      return;
+    }
+
+    // Assume that the checkout is not a branch (tree or hash) and try check it out
+    run_command('git checkout ' + treeish_name, cwd, function(err, output) {
+      if (err) {
+        logger.debug('Could not checkout %s; creating branch', treeish_name);
+        run_command('git checkout -b ' + treeish_name, cwd, cb);
+        return;
+      }
+      cb(null, output);
+    });
+  });
 };
 
-exports.clone = function(repo_url, branch_name, cwd, cb) {
-  run_command('git clone -b ' + branch_name + ' ' + repo_url + ' ' + branch_name, cwd, cb);
+exports.clone = function(repo_url, treeish_name, cwd, cb) {
+  run_command('git clone -n ' + repo_url + ' ' + treeish_name, cwd, function(err, output) {
+    if (err) {
+      cb(err);
+      return;
+    }
+
+    exports.checkout_treeish(treeish_name, cwd + '/' + treeish_name, cb);
+  });
 };
 
 exports.pull = function(branch_name, cwd, cb) {
@@ -122,8 +152,8 @@ exports.listAdditionalPropertyFiles = function(modifiedRecords, cwd, cb) {
 
   function is_properties_not_modified(modifiedRecords, file) {
     return file.substr(file.lastIndexOf('.') + 1) == "properties" && modifiedRecords.filter(function(record) {
-        return record.path == file;
-      }).length <= 0;
+      return record.path == file;
+    }).length <= 0;
   }
 
   run_command('git ls-tree --name-status -r HEAD', cwd, function(err, output) {
@@ -133,7 +163,7 @@ exports.listAdditionalPropertyFiles = function(modifiedRecords, cwd, cb) {
     var records = [];
     var files = output.split('\n');
     files.forEach(function(file) {
-      if(is_properties_not_modified(modifiedRecords, file)) {
+      if (is_properties_not_modified(modifiedRecords, file)) {
         records.push({'type': 'M', 'path': file});
       }
     });

test/git2consul_init_test.js

@@ -31,7 +31,7 @@ describe('Initializing git2consul', function() {
 
       var create_branch_and_add = function(branch_name, done) {
         return function() {
-          git_commands.checkout_branch(branch_name, git_utils.TEST_REMOTE_REPO, function(err) {
+          git_commands.checkout_treeish(branch_name, git_utils.TEST_REMOTE_REPO, function(err) {
             if (err) return done(err);
 
             git_utils.addFileToGitRepo("readme.md", "Test file in " + branch_name + " branch", branch_name + " commit", function(err) {