Merge pull request #2 from rwjblue/ensure-non-packed-tags-are-found

Ensure that unpacked tags are found.

Author: rwjblue

index.js

@@ -29,6 +29,37 @@ function findRepo(startingPath) {
   return null;
 }
 
+function findPackedTag(gitPath, sha) {
+  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];
+
+    if (tagLine) {
+      return tagLine.split('tags/')[1];
+    }
+  }
+}
+
+function findTag(gitPath, sha) {
+  var tag = findPackedTag(gitPath, sha);
+  if (tag) { return tag; }
+
+  var tagsPath = path.join(gitPath, 'refs', 'tags');
+  if (!fs.existsSync(tagsPath)) { return; }
+
+  var tags = fs.readdirSync(tagsPath);
+
+  for (var i = 0, l = tags.length; i < l; i++) {
+    var tagPath = path.join(tagsPath, tags[i]);
+    if (fs.readFileSync(tagPath, { encoding: 'utf8' }).indexOf(sha) > -1) {
+      return tags[i];
+    }
+  }
+}
+
 module.exports = function(gitPath) {
   if (!gitPath) { gitPath = findRepo(); }
 
@@ -61,16 +92,9 @@ module.exports = function(gitPath) {
       result.abbreviatedSha = result.sha.slice(0,10);
 
       // Find tag
-      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(result.sha) > -1;
-        })[0];
-
-        if (tagLine) {
-          result.tag = tagLine.split('tags/')[1];
-        }
+      var tag = findTag(gitPath, result.sha);
+      if (tag) {
+        result.tag = tag;
       }
     }
   } catch (e) {
@@ -81,4 +105,4 @@ module.exports = function(gitPath) {
 };
 
 module.exports._findRepo     = findRepo;
-module.exports._changeGitDir = changeGitDir;
+module.exports._changeGitDir = changeGitDir;

tests/fixtures/tagged-commit/dot-git/HEAD renamed to tests/fixtures/tagged-commit-packed/dot-git/HEAD

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

tests/fixtures/tagged-commit/dot-git/packed-refs renamed to tests/fixtures/tagged-commit-packed/dot-git/packed-refs

@@ -0,0 +1,3 @@
+5359aabd3872d9ffd160712e9615c5592dfe6745 refs/remotes/origin/master
+c76753aa8651471fe082a3ecd0790ec54f5ec673 refs/tags/v1.0.0
+6f2abfab299ad8e302f3a3023f88483f4be3b402 refs/tags/v1.0.1

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

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

tests/fixtures/tagged-commit-unpacked/dot-git/HEAD

@@ -79,8 +79,22 @@ describe('git-repo-info', function() {
     });
 
 
-    it('returns an object with repo info, including the tag', function() {
-      var repoRoot = path.join(testFixturesPath, 'tagged-commit');
+    it('returns an object with repo info, including the tag (packed tags)', function() {
+      var repoRoot = path.join(testFixturesPath, 'tagged-commit-packed');
+      var result = repoInfo(path.join(repoRoot, gitDir))
+
+      var expected = {
+        branch: 'master',
+        sha: '5359aabd3872d9ffd160712e9615c5592dfe6745',
+        abbreviatedSha: '5359aabd38',
+        tag: 'my-tag'
+      }
+
+      assert.deepEqual(result, expected);
+    });
+
+    it('returns an object with repo info, including the tag (unpacked tags)', function() {
+      var repoRoot = path.join(testFixturesPath, 'tagged-commit-unpacked');
       var result = repoInfo(path.join(repoRoot, gitDir))
 
       var expected = {