really turn off wextoolbox :)

[infrastructure.git] / scripts / git-mirror.sh

diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh
index e7af573..fbb7849 100755 (executable)
--- a/scripts/git-mirror.sh
+++ b/scripts/git-mirror.sh
@@ -8,12 +8,12 @@ QUIET=0
 function msg () {
     if [ $QUIET -eq 0 ]
     then
-        echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx $1"
+        echo "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx $@"
     fi
 }
 
 function error () {
-    echo "[ERROR] xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx $1"
+    echo "[ERROR] xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx $@"
 }
 
 function run () {
@@ -36,14 +36,14 @@ function merge_all_branches () {
     REMOTE=$2
     REPO_DIR=$3
 
-    pushd $REPO_DIR
-    BRANCHES=$(git branch -r | grep $REMOTE | grep -v "\->" | sed "s/.*\///g")
+    pushd $REPO_DIR > /dev/null
+    BRANCHES=$(git branch -r | grep $REMOTE | grep -v HEAD | sed "s/.*\///g" | grep -v master)
     popd > /dev/null
 
     run "git checkout master" ${REPO_DIR}
     run "git merge --ff $REMOTE/master" ${REPO_DIR}
     for BRANCH in $BRANCHES ; do
-        run "git branch $BRANCH" ${REPO_DIR}
+        run "git branch $BRANCH $REMOTE/$BRANCH" ${REPO_DIR}
         run "git checkout $BRANCH" ${REPO_DIR}
         run "git merge --ff $REMOTE/$BRANCH" ${REPO_DIR}
     done
@@ -54,8 +54,8 @@ function push_all_branches () {
     REMOTE=$2
     REPO_DIR=$3
 
-    pushd $REPO_DIR
-    BRANCHES=$(git branch -r | grep $REMOTE | grep -v "\->" | sed "s/.*\///g")
+    pushd $REPO_DIR > /dev/null
+    BRANCHES=$(git branch -r | grep $REMOTE | grep -v HEAD | sed "s/.*\///g" | grep -v master)
     popd > /dev/null
 
     run "git push $REMOTE master:master" ${REPO_DIR}