From: Baris Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 21 Jun 2010 12:31:14 +0000 (+0200)
Subject: try starting from scratch for every sync
X-Git-Tag: foo~102
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0e41ebfd8e1437dd3a60183ef8ab08d8d500aaaa;p=infrastructure.git

try starting from scratch for every sync
---

diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh
index 76befd0..271ab6b 100755
--- a/scripts/git-mirror.sh
+++ b/scripts/git-mirror.sh
@@ -23,6 +23,7 @@ function run () {
         COMMAND="$1 &> /dev/null"
     else
         COMMAND="$1"
+        msg $COMMAND
     fi
     REPO=$2
 
@@ -39,21 +40,26 @@ function mirror () {
         MIRROR_REPO=${MIRROR_GIT}/${GIT_NAME}
         MASTER_REPO=${MASTER_GIT}/${GIT_NAME}
 
-        if [ -d ${REPO_DIR} ]
-        then
-	    msg "pulling from ${REPO_NAME}"
-            run "git fetch origin --tags" ${REPO_DIR}
-	    run "git fetch origin" ${REPO_DIR}
-            run "git merge --ff origin/master" ${REPO_DIR}
-            if [ $? -ne 0 ]
-            then
-                error "Can not fetch from ${MASTER_REPO}"
-            fi
-        else
-            msg "mirroring in ${REPO_NAME} for the first time"
-            run "git clone ${MIRROR_REPO}" ${LOCAL_MIRROR_DIR}
-            run "git remote add local_master ${MASTER_REPO}" ${REPO_DIR}
-        fi
+#         if [ -d ${REPO_DIR} ]
+#         then
+# 	    msg "pulling from ${REPO_NAME}"
+#             run "git fetch origin --tags" ${REPO_DIR}
+# 	    run "git fetch origin" ${REPO_DIR}
+#             run "git merge --ff origin/master" ${REPO_DIR}
+#             if [ $? -ne 0 ]
+#             then
+#                 error "Can not fetch from ${MASTER_REPO}"
+#             fi
+#         else
+#             msg "mirroring in ${REPO_NAME} for the first time"
+#             run "git clone ${MIRROR_REPO}" ${LOCAL_MIRROR_DIR}
+#             run "git remote add local_master ${MASTER_REPO}" ${REPO_DIR}
+#         fi
+
+        msg "mirroring in ${REPO_NAME} for the first time"
+        run "rm -rf ${REPO_DIR}" ${LOCAL_MIRROR_DIR}
+        run "git clone ${MIRROR_REPO}" ${LOCAL_MIRROR_DIR}
+        run "git remote add local_master ${MASTER_REPO}" ${REPO_DIR}
 
         msg "pushing ${REPO_NAME} to local master"
         run "git fetch local_master --tags" ${REPO_DIR}