Merge pull request #2625 from erwinmombay/fix-cyc-changelog

fix changelog to handle PR's that have a merge coming from master
ampproject · Mar 17, 2016 · 54db402 · 54db402
2 parents e2848a0 + c1a51c2
commit 54db402
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/build-system/tasks/changelog.js b/build-system/tasks/changelog.js
@@ -217,7 +217,8 @@ function getLastGitTag() {
  */
 function getGitLog(tag) {
   var options = {
-    args: 'log ' + branch + '...' + tag + ' --pretty=format:%s --merges'
+    args: 'log ' + branch + '...' + tag +
+        ' --pretty=format:%s --merges --first-parent'
   };
   return gitExec(options).then(function(log) {
     if (!log) {
@@ -306,7 +307,7 @@ function onGitLogSuccess(gitMetadata, logs) {
   assert(typeof logs == 'string', 'git log should be a string.\n' + logs);
   return commits
     .filter(function(commit) {
-      // filter non Pull request merges
+      // Filter non Pull request merges.
       return commit.indexOf('Merge pull') == 0;
     })
     .map(function(commit) {
@@ -324,7 +325,7 @@ function errHandler(err) {
     msg = err.message;
   }
   util.log(util.colors.red(msg));
-  return err;
+  throw err;
 }
 
 /**