From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Thu, 1 Jul 2010 14:18:35 +0000 (+0200)
Subject: use fetch/merge instead of pull as in git-mirror.sh
X-Git-Tag: 5.0-rc12~58^2
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=f9ec8978a061fc13dfcf9679de031b8d6e2ed24e;p=build.git

use fetch/merge instead of pull as in git-mirror.sh
---

diff --git a/module-tools.py b/module-tools.py
index 3db3f881..a6a79610 100755
--- 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: