Fixes an issue that caused a request for the password if only the sftp_key was provided.

pocketarc · pocketarc · commit 0d2dbf4a91a5 · 2015-01-20T12:10:04.000Z
diff --git a/git-deploy b/git-deploy
@@ -636,7 +636,7 @@ class Config {
                     'upload_untracked' => array()
                         ), $options);
 
-                if (!isset($options['pass'])) {
+                if (!isset($options['pass']) and !isset($options['sftp_key'])) {
                     $options['pass'] = self::promptPassword();
                 }
 

Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ class Config {`
`636`	`636`	`'upload_untracked' => array()`
`637`	`637`	`), $options);`
`638`	`638`
`639`		`- if (!isset($options['pass'])) {`
	`639`	`+ if (!isset($options['pass']) and !isset($options['sftp_key'])) {`
`640`	`640`	`$options['pass'] = self::promptPassword();`
`641`	`641`	`}`
`642`	`642`