Merge pull request #18 from seawatts/master

Add the ability to get a packed ref if the branchPath does not exist

Author: rwjblue

index.js

@@ -30,20 +30,48 @@ function findRepo(startingPath) {
   return null;
 }
 
-function findPackedTag(gitPath, sha) {
+function findPackedTag(gitPath, refPath) {
+  return getPackedRefsForType(gitPath, refPath, 'tag');
+}
+
+function findPackedCommit(gitPath, refPath) {
+  return getPackedRefsForType(gitPath, refPath, 'commit');
+}
+
+function getPackedRefsForType(gitPath, refPath, type) {
   var packedRefsFilePath = path.join(gitPath, 'packed-refs');
   if (fs.existsSync(packedRefsFilePath)) {
-    var packedRefsFile = fs.readFileSync(packedRefsFilePath, {encoding: 'utf8'});
-    var tagLine = packedRefsFile.split('\n').filter(function(line) {
-      return line.indexOf('refs/tags') > -1 && line.indexOf(sha) > -1;
-    })[0];
+    var packedRefsFile = fs.readFileSync(packedRefsFilePath, { encoding: 'utf8' });
+    var shaLine = getLineForRefPath(packedRefsFile, type, refPath);
 
-    if (tagLine) {
-      return tagLine.split('tags/')[1];
+    if (shaLine) {
+      return getShaBasedOnType(type, shaLine);
     }
   }
 }
 
+function getLineForRefPath(packedRefsFile, type, refPath) {
+  return packedRefsFile.split('\n').filter(function(line) {
+    return doesLineMatchRefPath(type, line, refPath);
+  })[0];
+}
+
+function doesLineMatchRefPath(type, line, refPath) {
+  var refPrefix = type === 'tag' ? 'refs/tags' : 'refs/heads';
+  return line.indexOf(refPrefix) > -1 && line.indexOf(refPath) > -1;
+}
+
+function getShaBasedOnType(type, shaLine) {
+  var shaResult = '';
+  if (type === 'tag') {
+    shaResult = shaLine.split('tags/')[1];
+  } else if (type === 'commit') {
+    shaResult = shaLine.split(' ')[0];
+  }
+
+  return shaResult;
+}
+
 function commitForTag(gitPath, tag) {
   var tagPath = path.join(gitPath, 'refs', 'tags', tag);
   var taggedObject = fs.readFileSync(tagPath, { encoding: 'utf8' }).trim();
@@ -57,7 +85,8 @@ function commitForTag(gitPath, tag) {
 
   var objectContents = zlib.inflateSync(fs.readFileSync(objectPath)).toString();
 
-  // 'tag 172\u0000object c1ee41c325d54f410b133e0018c7a6b1316f6cda\ntype commit\ntag awesome-tag\ntagger Robert Jackson <[email protected]> 1429100021 -0400\n\nI am making an annotated tag.\n'
+  // 'tag 172\u0000object c1ee41c325d54f410b133e0018c7a6b1316f6cda\ntype commit\ntag awesome-tag\ntagger Robert Jackson
+  // <[email protected]> 1429100021 -0400\n\nI am making an annotated tag.\n'
   if (objectContents.slice(0,3) === 'tag') {
     var sections = objectContents.split(/\0|\n/);
     var sha = sections[1].slice(7);
@@ -112,10 +141,15 @@ module.exports = function(gitPath) {
 
       // Find branch and SHA
       if (refPath) {
-        var branchPath = path.join(gitPath, refPath.trim());
+        refPath = refPath.trim();
+        var branchPath = path.join(gitPath, refPath);
 
         result.branch  = branchName;
-        result.sha     = fs.readFileSync(branchPath, {encoding: 'utf8' }).trim();
+        if (fs.existsSync(branchPath)) {
+          result.sha = fs.readFileSync(branchPath, { encoding: 'utf8' }).trim();
+        } else {
+          result.sha = findPackedCommit(gitPath, refPath);
+        }
       } else {
         result.sha = branchName;
       }

tests/fixtures/commit-packed/dot-git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/develop

tests/fixtures/commit-packed/dot-git/packed-refs

@@ -0,0 +1,5 @@
+5359aabd3872d9ffd160712e9615c5592dfe6745 refs/remotes/origin/master
+d670460b4b4aece5915caf5c68d12f560a9fe3e4 refs/heads/develop
+c76753aa8651471fe082a3ecd0790ec54f5ec673 refs/tags/v1.0.0
+5359aabd3872d9ffd160712e9615c5592dfe6745 refs/tags/my-tag
+6f2abfab299ad8e302f3a3023f88483f4be3b402 refs/tags/v1.0.1

tests/index.js

@@ -92,6 +92,20 @@ describe('git-repo-info', function() {
       assert.deepEqual(result, expected);
     });
 
+    it('returns an object with repo info (packed commit)', function() {
+      var repoRoot = path.join(testFixturesPath, 'commit-packed');
+      var result = repoInfo(path.join(repoRoot, gitDir));
+
+      var expected = {
+        branch: 'develop',
+        sha: 'd670460b4b4aece5915caf5c68d12f560a9fe3e4',
+        abbreviatedSha: 'd670460b4b',
+        tag: null,
+        root: repoRoot
+      };
+
+      assert.deepEqual(result, expected);
+    });
 
     it('returns an object with repo info, including the tag (packed tags)', function() {
       var repoRoot = path.join(testFixturesPath, 'tagged-commit-packed');