Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deploy.sample.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
define("LOGFILE", "deploy.log"); // The name of the file you want to log to.
define("GIT", "/usr/bin/git"); // The path to the git executable
define("MAX_EXECUTION_TIME", 180); // Override for PHP's max_execution_time (may need set in php.ini)
define("BEFORE_PULL", ""); // A command to execute before pulling
define("BEFORE_PULL", "/usr/bin/git reset --hard @{u}"); // A command to execute before pulling
define("AFTER_PULL", ""); // A command to execute after successfully pulling

require_once("deployer.php");
2 changes: 1 addition & 1 deletion deployer.php
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ function forbid($file, $reason) {
/**
* Attempt to pull, returing the output and exit code
*/
exec(GIT . " pull 2>&1", $output, $exit);
exec(GIT . " pull --recurse-submodules 2>&1", $output, $exit);

// reformat the output as a string
$output = (!empty($output) ? implode("\n", $output) : "[no output]") . "\n";
Expand Down