Skip to content

Commit 76ad166

Browse files
committed
Remove --ignore-whitepsace git apply switch as a hope to fix the tests on travis
1 parent 7f9203a commit 76ad166

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ matrix:
2222
install:
2323
- travis_retry composer install --ansi --prefer-dist --no-interaction --optimize-autoloader --no-suggest --no-progress
2424

25-
script: ./vendor/bin/phpunit --debug
25+
script: ./vendor/bin/phpunit --debug --testdox

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, '--ignore-whitespace', $patchFile];
117+
$cmd = ['git', 'apply', '-v', '-p' . $stripPathComponents, $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)