fix: checkout merge base for cherry diff (#37)

* chore: cosmetic * chore: remove api key * chore: list branches * chore: echo head ref * chore: show ref * chore: rev parse head * chore: head ref * chore: origin/main * chore: origin/main * chore: fetch main * chore: fetch main * chore: checkout main * chore: checkout main via cli * chore: merge base with origin * feat: checkout merge base for cherry diff
cherrypush · Jan 22, 2024 · db1106b · db1106b
1 parent 5c3916e
commit db1106b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/.github/workflows/cherry_diff.yml b/.github/workflows/cherry_diff.yml
@@ -17,4 +17,4 @@ jobs:
         run: npm install
 
       - name: Raise if new JavaScript code is added
-        run: ./bin/cherry.js diff --metric='[loc] JavaScript' --api-key=${{ secrets.CHERRY_API_KEY }} --error-if-increase --quiet
+        run: ./bin/cherry.js diff --metric='[loc] JavaScript' --error-if-increase --quiet
diff --git a/src/git.js b/src/git.js
@@ -41,10 +41,8 @@ export const getDefaultBranchName = async () => {
   return defaultBranch.replace('origin/', '').trim()
 }
 
-export const getMergeBase = async (currentBranchName, defaultBranchName) => {
-  const mergeBase = (await git(`merge-base ${currentBranchName} ${defaultBranchName}`)).toString()
-  return mergeBase.trim()
-}
+export const getMergeBase = async (currentBranchName, defaultBranchName) =>
+  (await git(`merge-base ${currentBranchName} origin/${defaultBranchName}`)).toString().trim()
 
 export const authorName = async (sha) => (await git(`show ${sha} --format=%an --no-patch`))[0]