Attempt to pull "master" before blacklist branch creation

If the pull fails, we'll hit the standard "Not at HEAD" error case. If it succeeds, we won't break anything.
Charcoal-SE · Dec 28, 2016 · eb7e510 · eb7e510
1 parent 790e831
commit eb7e510
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/gitmanager.py b/gitmanager.py
@@ -31,6 +31,10 @@ def add_to_blacklist(self, **kwargs):
             return (False, "Invalid blacklist type specified, something has broken badly!")
 
         git.checkout("master")
+        try:
+            git.pull()
+        except:
+            pass
 
         # Check that we're up-to-date with origin (GitHub)
         git.remote.update()