Skip to content

Commit 7f9203a

Browse files
committed
Remove --inaccurate-eof git apply switch as it seems to be buggy in certain git versions
1 parent e7afa20 commit 7f9203a

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/PatchApplicator.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ private function executePatchCommand($method, $targetDirectory, $patchFile, $str
114114
if ($method === self::METHOD_PATCH && $this->hasPatchCommand()) {
115115
$cmd = ['patch', '--posix', '--strip=' . $stripPathComponents, '--input='.$patchFile, '--directory='.$targetDirectory];
116116
} else {
117-
$cmd = ['git', 'apply', '-v', '-p' . $stripPathComponents, '--inaccurate-eof', '--ignore-whitespace', $patchFile];
117+
$cmd = ['git', 'apply', '-v', '-p' . $stripPathComponents, '--ignore-whitespace', $patchFile];
118118

119119
if (is_dir(rtrim($targetDirectory, '/') . '/.git')) {
120120
// Target dir is a git repo so apply relative to it - apparently some git versions have problems otherwise.

0 commit comments

Comments
 (0)