Simplify git branch update logic

f69b9654 · Michal Čihař · 759f5bde · f69b9654
Commit f69b9654 authored Apr 03, 2012 by Michal Čihař
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

trans/models.py trans/models.py +1 -4

No files found.
--- a/trans/models.py
+++ b/trans/models.py
@@ -247,11 +247,8 @@ class SubProject(models.Model):
        Ensures local tracking branch exists and is checkouted.
        '''
        gitrepo = self.get_repo()
-        try:
+        if not self.branch in gitrepo.heads:
-            head = gitrepo.heads[self.branch]
-        except:
            gitrepo.git.branch('--track', self.branch, 'origin/%s' % self.branch)
-            head = gitrepo.heads[self.branch]
        gitrepo.git.checkout(self.branch)
        del gitrepo