[jhbuild] let _checkout call to branch, sticky date and submodules logic from _update

[Frederic Peters <fpeters src gnome org>]

commit 840a8ce71b35473e52dd53950a39f64f20dc53b3
Author: Frederic Peters <fpeters 0d be>
Date:   Fri Apr 24 18:30:52 2009 +0200

    let _checkout call to branch, sticky date and submodules logic from _update
---
 jhbuild/versioncontrol/git.py |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/jhbuild/versioncontrol/git.py b/jhbuild/versioncontrol/git.py
index cc4c966..e5c3173 100644
--- a/jhbuild/versioncontrol/git.py
+++ b/jhbuild/versioncontrol/git.py
@@ -226,16 +226,10 @@ class GitBranch(Branch):
         else:
             buildscript.execute(cmd, cwd=self.config.checkoutroot)
 
-        if self.branch:
-            buildscript.execute(['git', 'checkout', '--track', '-b',
-                    self.branch, 'origin/' + self.branch], cwd=self.get_checkoutdir())
-
-        if self.config.sticky_date:
-            self._update(buildscript)
+        self._update(buildscript, copydir=copydir, update_mirror=False)
 
-        self._update_submodules(buildscript)
 
-    def _update(self, buildscript, copydir=None):
+    def _update(self, buildscript, copydir=None, update_mirror=True):
         cwd = self.get_checkoutdir(copydir)
 
         if not os.path.exists(os.path.join(cwd, '.git')):
@@ -248,7 +242,8 @@ class GitBranch(Branch):
         else:
             quiet = []
 
-        self.update_dvcs_mirror(buildscript)
+        if update_mirror:
+            self.update_dvcs_mirror(buildscript)
 
         stashed = False
         if get_output(['git', 'diff'], cwd=cwd):