Optimize updating git repo logic

Change-Id: I3ed80bba2536a008bd225ffabb0b90094209a40a

diff --git a/common/git.py b/common/git.py
index fe99db7..24b2041 100644 (file)
--- a/common/git.py
+++ b/common/git.py
@@ -86,12 +86,14 @@ def _update_gitproject(localdir, gitpath=None):
     print '\nUpdating local git: %s' % localdir
     try:
         localgit = Git(localdir)
-        if not localgit.bare:
-            localgit.pull(repo=gitpath, all_repos=True)
         if gitpath and localgit.get_remote_repos().get('origin')[0] != gitpath:
             os.system('git --git-dir=%s remote set-url origin %s' % ([localdir,
                 os.path.join(localdir, '.git')][localgit.bare], gitpath))
-        localgit.fetch(all_remotes=True)
+        if localgit.bare:
+            localgit.fetch(all_remotes=True)
+        else:
+            localgit.fetch(tags=True)
+            localgit.pull()
     except GitRepositoryError, gre:
         print('git execption: ', gre)
         shutil.rmtree(localdir)