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 (file)
new mode 100755 (executable)
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