From d6904539145bfd4e1938ce69050adeb0cce79011 Mon Sep 17 00:00:00 2001
From: Baris Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Mon, 21 Jun 2010 14:38:47 +0200
Subject: [PATCH] revert last

---
 scripts/git-mirror.sh | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh
index 271ab6b..bf552c8 100755
--- a/scripts/git-mirror.sh
+++ b/scripts/git-mirror.sh
@@ -40,26 +40,21 @@ 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
-
-        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}
+        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 "pushing ${REPO_NAME} to local master"
         run "git fetch local_master --tags" ${REPO_DIR}
-- 
2.43.0