Merge pull request #21 from DaveLiddament/fix/diff-reference-point

FIX compare baseline against current code NOT most recent commit.
DaveLiddament · Dec 30, 2018 · 1e9e05a · 1e9e05a
2 parents 7693d38 + da8dc9b
commit 1e9e05a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/src/Plugins/GitDiffHistoryAnalyser/GitDiffHistoryFactory.php b/src/Plugins/GitDiffHistoryAnalyser/GitDiffHistoryFactory.php
@@ -52,8 +52,7 @@ public function newHistoryAnalyser(HistoryMarker $baseLineHistoryMarker, Project
     {
         /** @var GitCommit $baseLineHistoryMarker */
         Assert::isInstanceOf($baseLineHistoryMarker, GitCommit::class);
-        $newDiff = $this->gitCliWrapper->getCurrentSha($projectRoot);
-        $diff = $this->gitCliWrapper->getGitDiff($projectRoot, $baseLineHistoryMarker, $newDiff);
+        $diff = $this->gitCliWrapper->getGitDiff($projectRoot, $baseLineHistoryMarker);
         $fileMutations = $this->parser->parseDiff($diff);
 
         return new DiffHistoryAnalyser($fileMutations);

diff --git a/src/Plugins/GitDiffHistoryAnalyser/internal/GitCliWrapper.php b/src/Plugins/GitDiffHistoryAnalyser/internal/GitCliWrapper.php
@@ -34,14 +34,13 @@ public function getCurrentSha(ProjectRoot $projectRoot): GitCommit
     /**
      * {@inheritdoc}
      */
-    public function getGitDiff(ProjectRoot $projectRoot, GitCommit $originalCommit, GitCommit $newCommit): string
+    public function getGitDiff(ProjectRoot $projectRoot, GitCommit $originalCommit): string
     {
-        $range = sprintf('%s..%s', $originalCommit->asString(), $newCommit->asString());
         $arguments = [
             'diff',
             '-w',
             '-M',
-            $range,
+            $originalCommit->asString(),
         ];
         $command = $this->getGitCommand($arguments, $projectRoot);
 
@@ -83,7 +82,7 @@ private function getGitCommand(array $arguments, ProjectRoot $projectRoot): arra
     {
         $gitCommand = [
             'git',
-            "--git-dir={$projectRoot}/.git",
+            '--git-dir='.$projectRoot.\DIRECTORY_SEPARATOR.'.git',
             "--work-tree={$projectRoot}",
         ];
 

diff --git a/src/Plugins/GitDiffHistoryAnalyser/internal/GitWrapper.php b/src/Plugins/GitDiffHistoryAnalyser/internal/GitWrapper.php
@@ -31,9 +31,8 @@ public function getCurrentSha(ProjectRoot $projectRoot): GitCommit;
      *
      * @param ProjectRoot $projectRoot
      * @param GitCommit $originalCommit
-     * @param GitCommit $newCommit
      *
      * @return string
      */
-    public function getGitDiff(ProjectRoot $projectRoot, GitCommit $originalCommit, GitCommit $newCommit): string;
+    public function getGitDiff(ProjectRoot $projectRoot, GitCommit $originalCommit): string;
 }
diff --git a/tests/Unit/Plugins/GitDiffHistoryAnalyser/internal/StubGitWrapper.php b/tests/Unit/Plugins/GitDiffHistoryAnalyser/internal/StubGitWrapper.php
@@ -40,7 +40,7 @@ public function getCurrentSha(ProjectRoot $projectRoot): GitCommit
     /**
      * {@inheritdoc}
      */
-    public function getGitDiff(ProjectRoot $projectRoot, GitCommit $originalCommit, GitCommit $newCommit): string
+    public function getGitDiff(ProjectRoot $projectRoot, GitCommit $originalCommit): string
     {
         return $this->diff;
     }