Add --ignore-whitespace option to patch command. (#93)

pantheon-systems · Dec 7, 2022 · 7ebba2d · 7ebba2d
1 parent 889ae6c
commit 7ebba2d
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/Update/Methods/DiffPatch.php b/src/Update/Methods/DiffPatch.php
@@ -68,8 +68,8 @@ public function update(WorkingCopy $originalProject, array $parameters)
         // Apply the diff as a patch
         $tmpfname = tempnam(sys_get_temp_dir(), "diff-patch-" . $parameters['meta']['current-version'] . '-' . $this->latest . '.tmp');
         file_put_contents($tmpfname, $diffContents . "\n");
-        $this->logger->notice('patch -d {file} --no-backup-if-mismatch -Nutp1 < {tmpfile}', ['file' => $this->originalProject->dir(), 'tmpfile' => $tmpfname]);
-        passthru('patch -d ' .  $this->originalProject->dir() . ' --no-backup-if-mismatch -Nutp1 < ' . $tmpfname, $exitCode);
+        $this->logger->notice('patch -d {file} --no-backup-if-mismatch --ignore-whitespace -Nutp1 < {tmpfile}', ['file' => $this->originalProject->dir(), 'tmpfile' => $tmpfname]);
+        passthru('patch -d ' .  $this->originalProject->dir() . ' --no-backup-if-mismatch --ignore-whitespace -Nutp1 < ' . $tmpfname, $exitCode);
         if ($exitCode !== 0) {
             throw new \Exception("Failed to apply diff as patch");
         }