Uncomment git stash
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
parent
668b9f8fb9
commit
4a0410d969
1 changed files with 8 additions and 8 deletions
16
upgrade.php
16
upgrade.php
|
@ -437,14 +437,14 @@ $git_version = shell_exec('git --version');
|
|||
|
||||
if ((strpos('git version', $git_version)) === false) {
|
||||
echo "Git is installed. \n";
|
||||
// $git_fetch = shell_exec('git fetch');
|
||||
// $git_checkout = shell_exec('git checkout '.$branch);
|
||||
// $git_stash = shell_exec('git stash');
|
||||
// $git_pull = shell_exec('git pull');
|
||||
// echo $git_fetch;
|
||||
// echo '-- '.$git_stash;
|
||||
// echo '-- '.$git_checkout;
|
||||
// echo '-- '.$git_pull."\n";
|
||||
$git_fetch = shell_exec('git fetch');
|
||||
$git_checkout = shell_exec('git checkout '.$branch);
|
||||
$git_stash = shell_exec('git stash');
|
||||
$git_pull = shell_exec('git pull');
|
||||
echo $git_fetch;
|
||||
echo '-- '.$git_stash;
|
||||
echo '-- '.$git_checkout;
|
||||
echo '-- '.$git_pull."\n";
|
||||
} else {
|
||||
echo "Git is NOT installed. You can still use this upgrade script to run common \n";
|
||||
echo "migration commands, but you will have to manually download the updated files. \n\n";
|
||||
|
|
Loading…
Add table
Reference in a new issue