feat: improved error handling

thathoff · Feb 24, 2017 · ff36ea4 · ff36ea4
1 parent 28f57a8
commit ff36ea4
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/helpers.php b/helpers.php
@@ -81,16 +81,20 @@ public function pull($branch = false)
 
     public function kirbyChange($commitMessage)
     {
-        $this->getRepo()->checkout($this->branch);
+        try {
+            $this->getRepo()->checkout($this->branch);
 
-        if ($this->pullOnChange) {
-            $this->pull();
-        }
-        if ($this->commitOnChange) {
-            $this->commit($commitMessage . "\n\nby " . site()->user());
-        }
-        if ($this->pushOnChange) {
-            $this->push();
+            if ($this->pullOnChange) {
+                $this->pull();
+            }
+            if ($this->commitOnChange) {
+                $this->commit($commitMessage . "\n\nby " . site()->user());
+            }
+            if ($this->pushOnChange) {
+                $this->push();
+            }
+        } catch(Exception $exception) {
+            trigger_error('Unable to update git: ' . $exception->getMessage());
         }
     }
 }