Remove unneeded separate call for unstaged changes

See https://stackoverflow.com/a/15765921/9334572

Author: plotbox-io

src/Git/BranchModifications.php

@@ -10,21 +10,18 @@ class BranchModifications
     private $modifiedFiles;
     /** @var RelativeFile[] */
     private $newFiles;
-    /** @var TouchedLines */
-    private $unstagedChanges;
+
     /**
      * @param TouchedLines $modifiedFiles
      * @param RelativeFile[] $newFiles
-     * @param TouchedLines $unstagedChanges
      */
-    public function __construct(TouchedLines $modifiedFiles, array $newFiles, TouchedLines $unstagedChanges)
+    public function __construct(TouchedLines $modifiedFiles, array $newFiles)
     {
         $this->modifiedFiles = $modifiedFiles;
         $this->newFiles = [];
         foreach ($newFiles as $newFile) {
             $this->newFiles[$newFile->getPath()] = $newFile;
         }
-        $this->unstagedChanges = $unstagedChanges;
     }
 
     /**
@@ -35,7 +32,6 @@ public function __construct(TouchedLines $modifiedFiles, array $newFiles, Touche
     public function filter(FileFilter $filter)
     {
         $this->modifiedFiles->filter($filter);
-        $this->unstagedChanges->filter($filter);
         $this->newFiles = $filter->getFilteredFiles($this->newFiles);
     }
 
@@ -50,7 +46,6 @@ public function getModifiedFilePaths()
         return array_unique(
             array_merge(
                 $this->modifiedFiles->getModifiedPaths(),
-                $this->unstagedChanges->getModifiedPaths(),
                 array_keys($this->newFiles)
             )
         );
@@ -72,6 +67,6 @@ public function isNewFile(RelativeFile $file)
      */
     public function wasModified($file, $line)
     {
-        return $this->unstagedChanges->wasModified($file, $line) || $this->modifiedFiles->wasModified($file, $line);
+        return $this->modifiedFiles->wasModified($file, $line);
     }
 }

src/Git/BranchModificationsFactory.php

@@ -43,21 +43,13 @@ public function getBranchModificationsSpecified(Pointer $ancestorBranch, Pointer
         if (isset($this->branchModificationsCached[$cacheKey])) {
             return $this->branchModificationsCached[$cacheKey];
         }
-
-        // New files appear to be being picked up here also now. May be possible to
-        // drop the separate newly added files method below..
         $modifiedFiles = $this->git->parseTouchedLines(
-            new ComparisonDiffCommand(
-                $current,
-                $ancestorBranch
-            )
+            "git diff --unified=0 {$ancestorBranch->getName()}"
         );
         $newFiles = $this->git->getNewlyAddedFiles($mergeBase, $current);
-        $unstagedChanges = $this->git->parseTouchedLines(new UnstagedDiffCommand());
         $this->branchModificationsCached[$cacheKey] = new BranchModifications(
             $modifiedFiles,
-            $newFiles,
-            $unstagedChanges
+            $newFiles
         );
 
         return $this->branchModificationsCached[$cacheKey];

src/Git/ComparisonDiffCommand.php

@@ -73,19 +73,18 @@ public function getCommitsBetween(Pointer $mergeBase, Pointer $current)
     }
 
     /**
-     * @param DiffCommand $diffCommand
+     * @param string $diffCommand
      * @return TouchedLines
      * @see https://stackoverflow.com/a/24456418
      */
-    public function parseTouchedLines(DiffCommand $diffCommand)
+    public function parseTouchedLines($diffCommand)
     {
         $changes = new TouchedLines();
 
         $modifiedFileRegex = '#^\+\+\+ .\/(.*)#';
         $nullFileRegex = '#^\+\+\+ (\/dev\/null)#';
         $changedLinesRegex = '#^@@ -[0-9]+(?:,[0-9]+)? \+([0-9]+(?:,[0-9]+)?)(?= @@)#';
-        $command = $diffCommand->toString();
-        $unifiedDiffResult = $this->cli->getResultArray($command);
+        $unifiedDiffResult = $this->cli->getResultArray($diffCommand);
 
         $currentFilePath = null;
         foreach ($unifiedDiffResult as $resultLine) {