fix(conventional-changelog-core): check if HEAD ref exists before usi…

…ng it (#578)
conventional-changelog · Dec 24, 2019 · dcb4b22 · dcb4b22
1 parent d25d7ac
commit dcb4b22
Show file tree

Hide file tree

Showing 4 changed files with 201 additions and 50 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/packages/conventional-changelog-core/index.js b/packages/conventional-changelog-core/index.js
@@ -7,6 +7,8 @@ const conventionalChangelogWriter = require('conventional-changelog-writer')
 const _ = require('lodash')
 const stream = require('stream')
 const through = require('through2')
+const shell = require('shelljs')
+
 const mergeConfig = require('./lib/merge-config')
 function conventionalChangelog (options, context, gitRawCommitsOpts, parserOpts, writerOpts, gitRawExecOpts) {
   writerOpts = writerOpts || {}
@@ -16,6 +18,26 @@ function conventionalChangelog (options, context, gitRawCommitsOpts, parserOpts,
   })
   readable._read = function () { }
 
+  var commitsErrorThrown = false
+
+  var commitsStream = new stream.Readable({
+    objectMode: true
+  })
+  commitsStream._read = function () { }
+
+  function commitsRange (from, to) {
+    return gitRawCommits(_.merge({}, gitRawCommitsOpts, {
+      from: from,
+      to: to
+    }))
+      .on('error', function (err) {
+        if (!commitsErrorThrown) {
+          setImmediate(commitsStream.emit.bind(commitsStream), 'error', err)
+          commitsErrorThrown = true
+        }
+      })
+  }
+
   mergeConfig(options, context, gitRawCommitsOpts, parserOpts, writerOpts, gitRawExecOpts)
     .then(function (data) {
       options = data.options
@@ -25,60 +47,44 @@ function conventionalChangelog (options, context, gitRawCommitsOpts, parserOpts,
       writerOpts = data.writerOpts
       gitRawExecOpts = data.gitRawExecOpts
 
-      var reverseTags = context.gitSemverTags.slice(0).reverse()
-      reverseTags.push('HEAD')
+      if (shell.exec('git rev-parse --verify HEAD', { silent: true }).code === 0) {
+        var reverseTags = context.gitSemverTags.slice(0).reverse()
+        reverseTags.push('HEAD')
 
-      if (gitRawCommitsOpts.from) {
-        if (reverseTags.indexOf(gitRawCommitsOpts.from) !== -1) {
-          reverseTags = reverseTags.slice(reverseTags.indexOf(gitRawCommitsOpts.from))
-        } else {
-          reverseTags = [gitRawCommitsOpts.from, 'HEAD']
+        if (gitRawCommitsOpts.from) {
+          if (reverseTags.indexOf(gitRawCommitsOpts.from) !== -1) {
+            reverseTags = reverseTags.slice(reverseTags.indexOf(gitRawCommitsOpts.from))
+          } else {
+            reverseTags = [gitRawCommitsOpts.from, 'HEAD']
+          }
         }
-      }
-
-      var commitsErrorThrown = false
 
-      var commitsStream = new stream.Readable({
-        objectMode: true
-      })
-      commitsStream._read = function () { }
-
-      function commitsRange (from, to) {
-        return gitRawCommits(_.merge({}, gitRawCommitsOpts, {
-          from: from,
-          to: to
-        }))
-          .on('error', function (err) {
-            if (!commitsErrorThrown) {
-              setImmediate(commitsStream.emit.bind(commitsStream), 'error', err)
-              commitsErrorThrown = true
-            }
-          })
-      }
+        var streams = reverseTags.map((to, i) => {
+          const from = i > 0
+            ? reverseTags[i - 1]
+            : ''
+          return commitsRange(from, to)
+        })
 
-      var streams = reverseTags.map((to, i) => {
-        const from = i > 0
-          ? reverseTags[i - 1]
-          : ''
-        return commitsRange(from, to)
-      })
+        if (gitRawCommitsOpts.from) {
+          streams = streams.splice(1)
+        }
 
-      if (gitRawCommitsOpts.from) {
-        streams = streams.splice(1)
-      }
+        if (gitRawCommitsOpts.reverse) {
+          streams.reverse()
+        }
 
-      if (gitRawCommitsOpts.reverse) {
-        streams.reverse()
+        streams.reduce((prev, next) => next.pipe(addStream(prev)))
+          .on('data', function (data) {
+            setImmediate(commitsStream.emit.bind(commitsStream), 'data', data)
+          })
+          .on('end', function () {
+            setImmediate(commitsStream.emit.bind(commitsStream), 'end')
+          })
+      } else {
+        commitsStream = gitRawCommits(gitRawCommitsOpts, gitRawExecOpts)
       }
 
-      streams.reduce((prev, next) => next.pipe(addStream(prev)))
-        .on('data', function (data) {
-          setImmediate(commitsStream.emit.bind(commitsStream), 'data', data)
-        })
-        .on('end', function () {
-          setImmediate(commitsStream.emit.bind(commitsStream), 'end')
-        })
-
       commitsStream
         .on('error', function (err) {
           err.message = 'Error in git-raw-commits: ' + err.message

diff --git a/packages/conventional-changelog-core/package.json b/packages/conventional-changelog-core/package.json
@@ -39,6 +39,7 @@
     "q": "^1.5.1",
     "read-pkg": "^3.0.0",
     "read-pkg-up": "^3.0.0",
+    "shelljs": "^0.8.3",
     "through2": "^3.0.0"
   },
   "scripts": {

diff --git a/packages/conventional-changelog-core/test/test.js b/packages/conventional-changelog-core/test/test.js
@@ -210,6 +210,32 @@ describe('conventionalChangelogCore', function () {
       }))
   })
 
+  it('should work when there is no `HEAD` ref', function (done) {
+    preparing(2)
+    shell.rm('.git/refs/HEAD')
+    var i = 0
+
+    conventionalChangelogCore({
+      releaseCount: 100
+    })
+      .pipe(through(function (chunk, enc, cb) {
+        chunk = chunk.toString()
+
+        if (i === 0) {
+          expect(chunk).to.include('Second commit')
+          expect(chunk).to.include('Third commit')
+        } else if (i === 1) {
+          expect(chunk).to.include('First commit')
+        }
+
+        i++
+        cb()
+      }, function () {
+        expect(i).to.equal(2)
+        done()
+      }))
+  })
+
   it('should honour `gitRawCommitsOpts.from`', function (done) {
     preparing(2)