Merge pull request #342 from thePanz/rsync-ignore-empty-excludes

Rsync task: ignore empty 'exclude' parameters
8 years ago · 35e835f0c9
parent c6ec69b7f2 e2bb29334d
commit 35e835f0c9
2 changed files with 2 additions and 2 deletions
--- a/src/Task/BuiltIn/Deploy/RsyncTask.php
+++ b/src/Task/BuiltIn/Deploy/RsyncTask.php
@ -55,7 +55,7 @@ class RsyncTask extends AbstractTask
    protected function getExcludes()
    {
        $excludes = $this->runtime->getEnvOption('exclude', []);
-        $excludes = array_merge(['.git'], $excludes);
+        $excludes = array_merge(['.git'], array_filter($excludes));

        foreach ($excludes as &$exclude) {
            $exclude = '--exclude=' . $exclude;
--- a/src/Task/BuiltIn/Deploy/Tar/PrepareTask.php
+++ b/src/Task/BuiltIn/Deploy/Tar/PrepareTask.php
@ -52,7 +52,7 @@ class PrepareTask extends AbstractTask
    protected function getExcludes()
    {
        $excludes = $this->runtime->getEnvOption('exclude', []);
-        $excludes = array_merge(['.git'], $excludes);
+        $excludes = array_merge(['.git'], array_filter($excludes));

        foreach ($excludes as &$exclude) {
            $exclude = '--exclude="' . $exclude . '"';