Merge pull request pocketarc#49 from maskas/master

pocketarc · pocketarc · commit f45774db7d49 · 2014-12-17T19:43:11.000Z
Create submodule directories. Fixes pocketarc#44
diff --git a/git-deploy b/git-deploy
@@ -280,7 +280,9 @@ abstract class Server {
             if ($list_only) {
                 logmessage("Uploaded: $file");
             } else {
-                $this->set_file($file, $contents);
+                if (!in_array($file, $changes['submodules'])) {
+                    $this->set_file($file, $contents);
+                }
             }
         }
 
@@ -298,8 +300,8 @@ abstract class Server {
         }
 
         foreach ($changes['submodules'] as $submodule) {
-            $this->set_file('REVISION', $submodule_meta[$submodule]['target_subcommit']);
-            $this->set_file('PREVIOUS_REVISION', (empty($submodule_meta[$submodule]['current_subcommit']) ? $submodule_meta[$submodule]['target_subcommit'] : $submodule_meta[$submodule]['current_subcommit']));
+            $this->set_file($submodule . '/REVISION', $submodule_meta[$submodule]['target_subcommit']);
+            $this->set_file($submodule . '/PREVIOUS_REVISION', (empty($submodule_meta[$submodule]['current_subcommit']) ? $submodule_meta[$submodule]['target_subcommit'] : $submodule_meta[$submodule]['current_subcommit']));
         }
 
         $this->set_current_commit($target_commit, $list_only);

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,9 @@ abstract class Server {`
`280`	`280`	`if ($list_only) {`
`281`	`281`	`logmessage("Uploaded: $file");`
`282`	`282`	`} else {`
`283`		`- $this->set_file($file, $contents);`
	`283`	`+ if (!in_array($file, $changes['submodules'])) {`
	`284`	`+ $this->set_file($file, $contents);`
	`285`	`+ }`
`284`	`286`	`}`
`285`	`287`	`}`
`286`	`288`
`@@ -298,8 +300,8 @@ abstract class Server {`
`298`	`300`	`}`
`299`	`301`
`300`	`302`	`foreach ($changes['submodules'] as $submodule) {`
`301`		`- $this->set_file('REVISION', $submodule_meta[$submodule]['target_subcommit']);`
`302`		`- $this->set_file('PREVIOUS_REVISION', (empty($submodule_meta[$submodule]['current_subcommit']) ? $submodule_meta[$submodule]['target_subcommit'] : $submodule_meta[$submodule]['current_subcommit']));`
	`303`	`+ $this->set_file($submodule . '/REVISION', $submodule_meta[$submodule]['target_subcommit']);`
	`304`	`+ $this->set_file($submodule . '/PREVIOUS_REVISION', (empty($submodule_meta[$submodule]['current_subcommit']) ? $submodule_meta[$submodule]['target_subcommit'] : $submodule_meta[$submodule]['current_subcommit']));`
`303`	`305`	`}`
`304`	`306`
`305`	`307`	`$this->set_current_commit($target_commit, $list_only);`