Merge pull request pocketarc#36 from sbtsrbayer/master

pocketarc · pocketarc · commit 94f6ffea0f03 · 2014-05-21T15:30:26.000+01:00
Error with "-l" parameter and preventative measure against newlines
diff --git a/git-deploy b/git-deploy
@@ -11,7 +11,7 @@ function main() {
         if ($args['revert']) {
             $server->revert($git, $args['list_only']);
         } else {
-            $server->deploy($git, $git->interpret_target_commit($args['target_commit'], $server->server['branch']), $args['list_only']);
+            $server->deploy($git, $git->interpret_target_commit($args['target_commit'], $server->server['branch']), false, $args['list_only']);
         }
     }
 }
@@ -119,6 +119,7 @@ class Git {
             'submodules' => $submodule_paths
         );
 
+        $command = str_replace(array("\n","\r\n"), '', $command);
         $result = $this->exec($command);
 
         if (empty($result)) {

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ function main() {`
`11`	`11`	`if ($args['revert']) {`
`12`	`12`	`$server->revert($git, $args['list_only']);`
`13`	`13`	`} else {`
`14`		`- $server->deploy($git, $git->interpret_target_commit($args['target_commit'], $server->server['branch']), $args['list_only']);`
	`14`	`+ $server->deploy($git, $git->interpret_target_commit($args['target_commit'], $server->server['branch']), false, $args['list_only']);`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`
`@@ -119,6 +119,7 @@ class Git {`
`119`	`119`	`'submodules' => $submodule_paths`
`120`	`120`	`);`
`121`	`121`
	`122`	`+ $command = str_replace(array("\n","\r\n"), '', $command);`
`122`	`123`	`$result = $this->exec($command);`
`123`	`124`
`124`	`125`	`if (empty($result)) {`