Skip to content

Commit

Permalink
Merge pull request #104 from david-garcia-garcia/master
Browse files Browse the repository at this point in the history
Remove GIT_DIR
  • Loading branch information
cweagans committed Feb 21, 2017
2 parents 86d2c5e + c76046e commit 306a4d4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/Patches.php
Original file line number Diff line number Diff line change
Expand Up @@ -358,10 +358,10 @@ protected function getAndApplyPatch(RemoteFilesystem $downloader, $install_path,
// it might be useful.
$patch_levels = array('-p1', '-p0', '-p2');
foreach ($patch_levels as $patch_level) {
$checked = $this->executeCommand('cd %s && GIT_DIR=. git apply --check %s %s', $install_path, $patch_level, $filename);
$checked = $this->executeCommand('cd %s && git apply --check %s %s', $install_path, $patch_level, $filename);
if ($checked) {
// Apply the first successful style.
$patched = $this->executeCommand('cd %s && GIT_DIR=. git apply %s %s', $install_path, $patch_level, $filename);
$patched = $this->executeCommand('cd %s && git apply %s %s', $install_path, $patch_level, $filename);
break;
}
}
Expand Down

0 comments on commit 306a4d4

Please sign in to comment.