try comparing the branches directly instead

Author: alokedesai

src/github.ts renamed to src/generate-changelog.ts

@@ -61,9 +61,12 @@ export async function generateChangelog(
   }
 
   if (lastReleaseVersion) {
-    // Find all the commits between the current release and the last release.
+    // Find all the commits in the branch for the current release that aren't in the branch for the last release.
+    const currentBranch = branchFromVersion(currentVersion, channel)
+    const previousBranch = branchFromVersion(lastReleaseVersion, channel)
+
     const command = shell.exec(
-      `git --no-pager log ${lastReleaseVersion}...${currentVersion} --pretty=format:%H`,
+      `git --no-pager log  ^${previousBranch} ${currentBranch} --pretty=format:%H`,
       {silent: true}
     )
 
@@ -80,6 +83,13 @@ export async function generateChangelog(
   }
 }
 
+function branchFromVersion(version: string, channel: string): string {
+  return `origin/${channel}_release/${version.substring(
+    0,
+    version.indexOf('_')
+  )}`
+}
+
 // Fetches PR body text from a series of commits.
 async function fetchPullRequestBodyFromCommits(
   commits: string[],