Merge pull request #31 from jrowlingson/master

Support packed annotated tags

Author: rwjblue

index.js

@@ -90,14 +90,19 @@ function getPackedRefsForType(gitPath, refPath, type) {
 }
 
 function getLineForRefPath(packedRefsFile, type, refPath) {
-  return packedRefsFile.split('\n').filter(function(line) {
-    return doesLineMatchRefPath(type, line, refPath);
-  })[0];
+  return getLinesForRefPath(packedRefsFile, type, refPath)[0];
+}
+
+function getLinesForRefPath(packedRefsFile, type, refPath) {
+  return packedRefsFile.split('\n').reduce(function(acc, line, idx, arr) {
+    var targetLine = line.indexOf('^') > -1 ? arr[idx-1] : line;
+    return doesLineMatchRefPath(type, line, refPath) ? acc.concat(targetLine) : acc;
+  }, []);
 }
 
 function doesLineMatchRefPath(type, line, refPath) {
   var refPrefix = type === 'tag' ? 'refs/tags' : 'refs/heads';
-  return line.indexOf(refPrefix) > -1 && line.indexOf(refPath) > -1;
+  return (line.indexOf(refPrefix) > -1 || line.indexOf('^') > -1) && line.indexOf(refPath) > -1;
 }
 
 function getShaBasedOnType(type, shaLine) {

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

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

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

@@ -0,0 +1,3 @@
+5359aabd3872d9ffd160712e9615c5592dfe6745 refs/remotes/origin/master
+456d170a0177147cf2f242c91f776037150b3d4b refs/tags/example-annotated-tag
+^5359aabd3872d9ffd160712e9615c5592dfe6745

tests/fixtures/tagged-commit-packed-annotated/dot-git/refs/heads/master

@@ -0,0 +1 @@
+5359aabd3872d9ffd160712e9615c5592dfe6745

tests/index.js

@@ -177,6 +177,26 @@ describe('git-repo-info', function() {
       assert.deepEqual(result, expected);
     });
 
+    it('returns an object with repo info, including the tag (packed annotated tag)', function() {
+      var repoRoot = path.join(testFixturesPath, 'tagged-commit-packed-annotated');
+      var result = repoInfo(path.join(repoRoot, gitDir));
+
+      var expected = {
+        branch: 'master',
+        sha: '5359aabd3872d9ffd160712e9615c5592dfe6745',
+        abbreviatedSha: '5359aabd38',
+        tag: 'example-annotated-tag',
+        committer: null,
+        committerDate: null,
+        author: null,
+        authorDate: null,
+        commitMessage: null,
+        root: repoRoot
+      };
+
+      assert.deepEqual(result, expected);
+    });
+
     if (zlib.inflateSync) {
       it('returns an object with repo info, including the tag (unpacked tags)', function() {
         var repoRoot = path.join(testFixturesPath, 'tagged-commit-unpacked');