Fix bug where comparison done directly to parent (rather than merge base)

plotbox-io · plotbox-io · commit 5b9d4e782b2b · 2020-04-20T14:16:45.000+01:00
diff --git a/src/Git/BranchModificationsFactory.php b/src/Git/BranchModificationsFactory.php
@@ -44,7 +44,7 @@ public function getBranchModificationsSpecified(Pointer $ancestorBranch, Pointer
             return $this->branchModificationsCached[$cacheKey];
         }
         $modifiedFiles = $this->git->parseTouchedLines(
-            "git diff --unified=0 {$ancestorBranch->getName()}"
+            "git diff --unified=0 {$mergeBase->getName()}"
         );
         $newFiles = $this->git->getNewlyAddedFiles($mergeBase, $current);
         $this->branchModificationsCached[$cacheKey] = new BranchModifications(

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function getBranchModificationsSpecified(Pointer $ancestorBranch, Pointer`
`44`	`44`	`return $this->branchModificationsCached[$cacheKey];`
`45`	`45`	`}`
`46`	`46`	`$modifiedFiles = $this->git->parseTouchedLines(`
`47`		`- "git diff --unified=0 {$ancestorBranch->getName()}"`
	`47`	`+ "git diff --unified=0 {$mergeBase->getName()}"`
`48`	`48`	`);`
`49`	`49`	`$newFiles = $this->git->getNewlyAddedFiles($mergeBase, $current);`
`50`	`50`	`$this->branchModificationsCached[$cacheKey] = new BranchModifications(`