Cherry diff with merge base instead of default branch (#36)

* Use merge base to avoid false positive * Fix args
cherrypush · Jan 22, 2024 · 66af9ff · 66af9ff
1 parent 8a7aeb6
commit 66af9ff
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/bin/commands/diff.js b/bin/commands/diff.js
@@ -46,7 +46,9 @@ export default function (program) {
 
       // TODO: If a file has been provided, then we can skip the merge base logic
       if (!inputFile) {
-        await git.checkout(await git.getDefaultBranchName())
+        const defaultBranchName = await git.getDefaultBranchName()
+        const baseBranchCommit = await git.getMergeBase(initialBranch, defaultBranchName)
+        await git.checkout(baseBranchCommit)
         previousOccurrences = await findOccurrences({
           configuration,
           files: await getFiles(),

diff --git a/src/git.js b/src/git.js
@@ -41,6 +41,11 @@ 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 authorName = async (sha) => (await git(`show ${sha} --format=%an --no-patch`))[0]
 
 export const authorEmail = async (sha) => (await git(`show ${sha} --format=%ae --no-patch`))[0]