From: Baris Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Fri, 18 Jun 2010 13:19:50 +0000 (+0200)
Subject: fetch tags and pull from local master before pushing for merges
X-Git-Tag: foo~109
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=ceb8f9f5549d7bb8a6812ede6ff9dd79f79a491e;p=infrastructure.git

fetch tags and pull from local master before pushing for merges
---

diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh
old mode 100644
new mode 100755
index 434b7e8..5dbc411
--- a/scripts/git-mirror.sh
+++ b/scripts/git-mirror.sh
@@ -14,7 +14,7 @@ function mirror () {
         then
 	    echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx pulling from ${REPO_NAME}"
             pushd ${REPO}
-            git pull --tags
+            git fetch --tags
             git pull
             popd
         else
@@ -27,6 +27,9 @@ function mirror () {
 
         echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx pushing ${REPO_NAME} to local master"
         pushd ${REPO}
+        git fetch local_master --tags
+        git pull local_master
+            
         git push local_master
         git push --tags local_master
         popd