Merge pull request #5 from AKPWebDesign/patch-1

Add support for branches with slashes in their names. Fixes #3.

Author: rwjblue

index.js

@@ -103,7 +103,10 @@ module.exports = function(gitPath) {
 
     if (fs.existsSync(headFilePath)) {
       var headFile = fs.readFileSync(headFilePath, {encoding: 'utf8'});
-      var branchName = headFile.split('/').slice(-1)[0].trim();
+      var branchName = headFile.split('/').slice(2).join('/').trim();
+      if (!branchName) {
+        branchName = headFile.split('/').slice(-1)[0].trim();
+      }
       var refPath = headFile.split(' ')[1];
 
       // Find branch and SHA

tests/fixtures/branch-with-slashes/dot-git/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/feature/branch/with/slashes

tests/fixtures/branch-with-slashes/dot-git/refs/heads/feature/branch/with/slashes

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

tests/fixtures/branch-with-slashes/dot-git/refs/heads/master

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

tests/index.js

@@ -127,5 +127,19 @@ describe('git-repo-info', function() {
         assert.deepEqual(result, expected);
       });
     }
+
+    it('returns an object with repo info, including the full branch name, if the branch name includes any slashes', function() {
+      var repoRoot = path.join(testFixturesPath, 'branch-with-slashes');
+      var result = repoInfo(path.join(repoRoot, gitDir));
+
+      var expected = {
+        branch: 'feature/branch/with/slashes',
+        sha: '5359aabd3872d9ffd160712e9615c5592dfe6745',
+        abbreviatedSha: '5359aabd38',
+        tag: null
+      };
+
+      assert.deepEqual(result, expected);
+    });
   });
 });