From 4a0410d9694a9af243a4d4c8b6bcae9db6c729ad Mon Sep 17 00:00:00 2001 From: snipe Date: Tue, 25 Feb 2025 16:55:39 +0000 Subject: [PATCH] Uncomment git stash Signed-off-by: snipe --- upgrade.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/upgrade.php b/upgrade.php index 2a1570a87..ecc424c79 100644 --- a/upgrade.php +++ b/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";