Fixes an issue that caused problems with uploading files with spaces in their filename.

Bruno Moreira De Barros · Bruno Moreira De Barros · commit 5740bfa45569 · 2019-05-16T19:52:35.000+01:00
diff --git a/composer.json b/composer.json
@@ -76,5 +76,8 @@
         "post-autoload-dump": [
             "php tools/build.php"
         ]
+    },
+    "require": {
+        "ext-ftp": "*"
     }
 }
diff --git a/git-deploy b/git-deploy
diff --git a/tools/src/Git.php b/tools/src/Git.php
@@ -68,7 +68,7 @@ public function get_changes($target_commit, $current_commit) {
             foreach ($result as $line) {
                 if ($line[0] == 'A' or $line[0] == 'C' or $line[0] == 'M') {
                     $path = trim(substr($line, 1, strlen($line)));
-                    $return['upload'][$path] = $this->get_file_contents("$target_commit:\"$path\"");
+                    $return['upload'][$path] = $this->get_file_contents("$target_commit:$path");
                 } elseif ($line[0] == 'D') {
                     $return['delete'][] = trim(substr($line, 1, strlen($line)));
                 } elseif ($line[0] == 'R') {
@@ -106,8 +106,6 @@ public function get_status_towards_remote($local_branch, $remote_branch)
             $remote_branch = "@{u}";
         }
 
-        $status;
-
         $this->exec("remote update");
 
         $local = $this->exec("rev-parse ".$local_branch);
@@ -136,7 +134,7 @@ public function get_status_towards_remote($local_branch, $remote_branch)
 
     protected function get_file_contents($path) {
         $temp = tempnam(sys_get_temp_dir(), "git-deploy-");
-        $this->exec('show "' . $path . '"', "> \"$temp\"");
+        $this->exec('show ' . escapeshellarg($path), "> \"$temp\"");
         return file_get_contents($temp);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -76,5 +76,8 @@`
`76`	`76`	`"post-autoload-dump": [`
`77`	`77`	`"php tools/build.php"`
`78`	`78`	`]`
	`79`	`+ },`
	`80`	`+ "require": {`
	`81`	`+ "ext-ftp": "*"`
`79`	`82`	`}`
`80`	`83`	`}`