Merge pull request #34 from jrowlingson/deterministic-tag

Support deterministic findTag

Author: rwjblue

index.js

@@ -69,28 +69,27 @@ function findRepo(startingPath) {
   return null;
 }
 
-function findPackedTag(gitPath, refPath) {
+function findPackedTags(gitPath, refPath) {
   return getPackedRefsForType(gitPath, refPath, 'tag');
 }
 
 function findPackedCommit(gitPath, refPath) {
-  return getPackedRefsForType(gitPath, refPath, 'commit');
+  return getPackedRefsForType(gitPath, refPath, 'commit')[0];
 }
 
 function getPackedRefsForType(gitPath, refPath, type) {
-  var packedRefsFilePath = path.join(gitPath, 'packed-refs');
-  if (fs.existsSync(packedRefsFilePath)) {
-    var packedRefsFile = fs.readFileSync(packedRefsFilePath, { encoding: 'utf8' });
-    var shaLine = getLineForRefPath(packedRefsFile, type, refPath);
-
-    if (shaLine) {
+  var packedRefsFile = getPackedRefsFile(gitPath);
+  if (packedRefsFile) {
+    return getLinesForRefPath(packedRefsFile, type, refPath).map(function(shaLine) {
       return getShaBasedOnType(type, shaLine);
-    }
+    });
   }
+  return [];
 }
 
-function getLineForRefPath(packedRefsFile, type, refPath) {
-  return getLinesForRefPath(packedRefsFile, type, refPath)[0];
+function getPackedRefsFile(gitPath) {
+  var packedRefsFilePath = path.join(gitPath, 'packed-refs');
+  return fs.existsSync(packedRefsFilePath) ? fs.readFileSync(packedRefsFilePath, { encoding: 'utf8' }) : false;
 }
 
 function getLinesForRefPath(packedRefsFile, type, refPath) {
@@ -143,22 +142,27 @@ function commitForTag(gitPath, tag) {
 }
 
 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 false; }
-
-  var tags = fs.readdirSync(tagsPath);
+  var tags = findPackedTags(gitPath, sha)
+    .concat(findUnpackedTags(gitPath, sha));
+  tags.sort();
+  return tags.length ? tags[0] : false;
+}
 
+function findUnpackedTags(gitPath, sha) {
+  var unpackedTags = [];
+  var tags = findLooseRefsForType(gitPath, 'tags');
   for (var i = 0, l = tags.length; i < l; i++) {
-    tag = tags[i];
     var commitAtTag = commitForTag(gitPath, tags[i]);
-
     if (commitAtTag === sha) {
-      return tag;
+      unpackedTags.push(tags[i]);
     }
   }
+  return unpackedTags;
+}
+
+function findLooseRefsForType(gitPath, type) {
+  var refsPath = path.join(gitPath, 'refs', type);
+  return fs.existsSync(refsPath) ? fs.readdirSync(refsPath) : [];
 }
 
 module.exports = function(gitPath) {

tests/fixtures/tagged-commit-mixed-packing/dot-git/HEAD

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

tests/fixtures/tagged-commit-mixed-packing/dot-git/objects/37/ece7ad9ded5f2312bb6be8d0c21ecebca088ac

@@ -0,0 +1 @@
+x
=�K� @]s��@�Kc\���0�V��L��^ܸ|�%O0��!��I���xB?{�ý�L����zM���jk��|6�1.��>������o*�\��H���sI���u�Å˾����f�g3���Ak���q{2D.�/%�6�

tests/fixtures/tagged-commit-mixed-packing/dot-git/objects/90/4de697a2c441e3db28f5c531ccfdab5f4435e3

@@ -0,0 +1,2 @@
+37ece7ad9ded5f2312bb6be8d0c21ecebca088ac refs/tags/b-lightweight-tag
+c1ee41c325d54f410b133e0018c7a6b1316f6cda refs/tags/-lightweight-tag

tests/fixtures/tagged-commit-mixed-packing/dot-git/objects/95/0a188f0a4224ce6a1ac710915113df972aeb2c

@@ -0,0 +1 @@
+37ece7ad9ded5f2312bb6be8d0c21ecebca088ac

tests/fixtures/tagged-commit-mixed-packing/dot-git/objects/e1/b209796f8918bf7ce1f00be1ea1923f5801339

@@ -0,0 +1 @@
+c1ee41c325d54f410b133e0018c7a6b1316f6cda

tests/fixtures/tagged-commit-mixed-packing/dot-git/packed-refs

@@ -0,0 +1 @@
+37ece7ad9ded5f2312bb6be8d0c21ecebca088ac