#1343 @0.25

diff --git a/inc/ws/Controlleur/class.ws.maintenance.php b/inc/ws/Controlleur/class.ws.maintenance.php
index 646f150f4dad5ffed7e5f43f0bac786ccd23da79..a330141508610e862461835e42c88d5d8d41e15b 100644 (file)
--- a/inc/ws/Controlleur/class.ws.maintenance.php
+++ b/inc/ws/Controlleur/class.ws.maintenance.php
@@ -869,7 +869,7 @@ class wsMaintenance {
                $localDir = $playerDir . 'local/';
                $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
                echo '<pre>';
-               echo $git->executeCmd('fetch --all');
+               echo $git->executeCmd('pull --all');
                $git = new CubeIT_CommandLine_Git($branchesDir . 'fluidbook-html5');
                $b = $git->executeCmd('branch -r');
                echo $b;
@@ -901,7 +901,10 @@ class wsMaintenance {
                        }
                        $git = new CubeIT_CommandLine_Git($branchesDir . $b);
                        echo $git->executeCmd('reset --hard origin/' . $b);
+                       $git = new CubeIT_CommandLine_Git($branchesDir . $b);
+                       echo $git->executeCmd('pull');
                }
+
                echo '</pre>';
                file_put_contents(WS_CACHE . '/activebranches', json_encode($branches));
        }