Add missing return when removing broken ref

scrapinghub · Feb 24, 2017 · f5b1649 · f5b1649
1 parent 88f264c
commit f5b1649
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/portia_server/storage/backends.py b/portia_server/storage/backends.py
@@ -215,7 +215,10 @@ def checkout(self, commit=None, branch=None, retry=True):
                     try:
                         commit = self.repo._repo.get_object(_commit_id)
                     except ObjectMissing:
-                        del self.repo._repo.refs[ref]
+                        if ref != 'refs/heads/master':
+                            del self.repo._repo.refs[ref]
+                        else:
+                            six.reraise(*sys.exc_info())
                     else:
                         break
         if commit is not None and isinstance(commit, string_types):
@@ -228,8 +231,11 @@ def checkout(self, commit=None, branch=None, retry=True):
                 tree = self.repo._repo.get_object(commit.tree)
             except ObjectMissing:
                 if retry and branch is not None:
-                    del self.repo._repo.refs['refs/heads/%s' % branch]
-                    self.checkout(branch='master', retry=False)
+                    if branch != 'master':
+                        del self.repo._repo.refs['refs/heads/%s' % branch]
+                        return self.checkout(branch='master', retry=False)
+                    else:
+                        six.reraise(*sys.exc_info())
         self._tree = tree
         self._working_tree = tree.copy()
         self._blobs = {}