just check git repository to see if the module is moved to git. we

[build.git] / module-tools.py

diff --git a/module-tools.py b/module-tools.py
index 3db3f88..70e2d10 100755 (executable)
--- a/module-tools.py
+++ b/module-tools.py
@@ -291,8 +291,9 @@ class GitRepository:
             return self.__run_in_repo(c.run_fatal)
 
     def update(self, subdir=None, recursive=None):
-        self.__run_command_in_repo("git fetch --tags")
-        self.__run_command_in_repo("git pull")
+        self.__run_command_in_repo("git fetch origin --tags")
+        self.__run_command_in_repo("git fetch origin")
+        self.__run_command_in_repo("git merge --ff origin/master")
 
     def to_branch(self, branch, remote=True):
         if remote:
@@ -355,11 +356,9 @@ class Repository:
     @classmethod
     def has_moved_to_git(cls, module, config):
         module = git_to_svn_name(module)
-        ret = SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (config['svnpath'], module))
-        if not ret:
-            # check if the module is already in Git
-            return GitRepository.remote_exists(Module.git_remote_dir(module))
-        return ret
+        # check if the module is already in Git
+#        return SvnRepository.remote_exists("%s/%s/aaaa-has-moved-to-git" % (config['svnpath'], module))
+        return GitRepository.remote_exists(Module.git_remote_dir(module))
 
 
     @classmethod