fix(impact): fix impacted files not accurately reported

https://stackoverflow.com/questions/25071579/list-all-files-changed-in-a-pull-request-in-git-github
flxbl-io · Jan 9, 2024 · 2be31ec · 2be31ec
1 parent 010834a
commit 2be31ec
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/packages/sfp-cli/src/core/git/Git.ts b/packages/sfp-cli/src/core/git/Git.ts
@@ -166,6 +166,10 @@ export default class Git {
         return git;
     }
 
+    public raw(commands: string[]) {
+        return this._git.raw(commands);
+    }   
+
     public getRepositoryPath() {
         return this.repositoryLocation;
     }

diff --git a/packages/sfp-cli/src/core/package/diff/PackageDiffImpl.ts b/packages/sfp-cli/src/core/package/diff/PackageDiffImpl.ts
@@ -57,7 +57,8 @@ export default class PackageDiffImpl {
             try {
                 if(this.diffOptions?.useBranchCompare)
                 {
-                 modified_files = await git.diff(['--name-only', `${this.diffOptions.baseBranch}..${this.diffOptions.branch}`]);
+                 const mergeBase = await git.raw(['merge-base', this.diffOptions.branch, this.diffOptions.baseBranch]);
+                 modified_files = await git.diff(['--name-only', this.diffOptions.branch, mergeBase.trim()]);
                 }
                 else
                 {
@@ -110,8 +111,10 @@ export default class PackageDiffImpl {
 
             if(this.diffOptions?.useBranchCompare)
             {
-                let modified_files = await git.diff(['--name-only', `${this.diffOptions.baseBranch}..${this.diffOptions.branch}`]);
-                // Check whether the package has been modified
+                const mergeBase = await git.raw(['merge-base', this.diffOptions.branch, this.diffOptions.baseBranch]);
+                let modified_files = await git.diff(['--name-only', this.diffOptions.branch,, mergeBase.trim()]);
+
+                 // Check whether the package has been modified
                 for (let filename of modified_files) {
 
                     let normalizedPkgPath = path.normalize(pkgDescriptor.path);