From 2106c3789690c022c2c92a25bdea509800430f88 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 27 Jun 2014 23:18:31 -0700 Subject: [PATCH] Reset git repo before pull. --- e107_handlers/cron_class.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/e107_handlers/cron_class.php b/e107_handlers/cron_class.php index 9d00c961d..21573503c 100644 --- a/e107_handlers/cron_class.php +++ b/e107_handlers/cron_class.php @@ -45,6 +45,11 @@ class _system_cron $mes->addDebug($cmd); $text .= `$cmd 2>&1`; + // Remove any local changes. + $cmd = 'git reset --hard'; + $mes->addDebug($cmd); + $text .= `$cmd 2>&1`; + // Run Pull request $cmd = 'git pull'; $mes->addDebug($cmd);