Skip to content

Fixes #148: Incompatible with Git 2.14+. #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 22, 2017
Merged

Fixes #148: Incompatible with Git 2.14+. #165

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d759a72
Fixes #148: Incompatible with Git 2.14+.
danepowell Nov 8, 2017
8c8c356
Check for failing git apply.
danepowell Nov 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions src/Patches.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,16 +382,28 @@ protected function getAndApplyPatch(RemoteFilesystem $downloader, $install_path,
// it might be useful. p4 is useful for Magento 2 patches
$patch_levels = array('-p1', '-p0', '-p2', '-p4');
foreach ($patch_levels as $patch_level) {
if ($this->io->isVerbose()) {
$comment = 'Testing ability to patch with git apply.';
$comment .= ' This command may produce errors that can be safely ignored.';
$this->io->write('<comment>' . $comment . '</comment>');
}
$checked = $this->executeCommand(
'cd %s && git --git-dir=. apply --check %s %s',
'git -C %s apply --check -v %s %s',
$install_path,
$patch_level,
$filename
);
$output = $this->executor->getErrorOutput();
if (substr($output, 0, 7) == 'Skipped') {
// Git will indicate success but silently skip patches in some scenarios.
//
// @see https://github.com/cweagans/composer-patches/pull/165
$checked = false;
}
if ($checked) {
// Apply the first successful style.
$patched = $this->executeCommand(
'cd %s && git --git-dir=. apply %s %s',
'git -C %s apply %s %s',
$install_path,
$patch_level,
$filename
Expand Down