Better git handling, particularly if the master branch disappears

diff --git a/common.py b/common.py
index 8070373c43ec82d3adb9d0971f76369c87d9087f..949c51a255a4ceae9f557601e3e36c369bbdd04e 100644 (file)
--- a/common.py
+++ b/common.py
@@ -76,6 +76,8 @@ class vcs:
         assert False    # Must be defined in child
 
     # Get new commits from the remote repository. Local must be clean.
+    # Fetch would really be a better name, as this doesn't necessarily
+    # (depending on the vcs) affect the local source tree or HEAD!
     def pull(self):
         assert False    # Must be defined in child
 
@@ -109,11 +111,8 @@ class vcs_git(vcs):
 
     def pull(self):
         self.checkrepo()
-        if subprocess.call(['git', 'pull', 'origin'],
-                cwd=self.local) != 0:
-            raise VCSException("Git pull failed")
         # Might need tags that aren't on a branch.
-        if subprocess.call(['git', 'fetch', '--tags', 'origin'],
+        if subprocess.call(['git', 'fetch', '--all', '--tags', 'origin'],
                 cwd=self.local) != 0:
             raise VCSException("Git fetch failed")