chiark / gitweb /
git-svn fix: run fetch to actually get new tags and branches
authorDaniel Martí <mvdan@mvdan.cc>
Tue, 18 Feb 2014 09:34:49 +0000 (10:34 +0100)
committerDaniel Martí <mvdan@mvdan.cc>
Tue, 18 Feb 2014 09:34:49 +0000 (10:34 +0100)
fdroidserver/common.py

index b0d8522b0c9c0bd81f5bba915d414936a54384e4..388a65f5a137a9a2a501c4a9a5f20ce9f959554a 100644 (file)
@@ -417,7 +417,10 @@ class vcs_gitsvn(vcs):
             if p.returncode != 0:
                 raise VCSException("Git clean failed")
             if not self.refreshed:
-                # Get new commits and tags from repo
+                # Get new commits, branches and tags from repo
+                p = SilentPopen(['%sgit svn fetch %s' % self.userargs()], cwd=self.local, shell=True)
+                if p.returncode != 0:
+                    raise VCSException("Git svn fetch failed")
                 p = SilentPopen(['%sgit svn rebase %s' % self.userargs()], cwd=self.local, shell=True)
                 if p.returncode != 0:
                     raise VCSException("Git svn rebase failed")