fixes

diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh
index e7af573..f60bd42 100755 (executable)
--- a/scripts/git-mirror.sh
+++ b/scripts/git-mirror.sh
@@ -37,13 +37,13 @@ function merge_all_branches () {
     REPO_DIR=$3
 
     pushd $REPO_DIR
-    BRANCHES=$(git branch -r | grep $REMOTE | grep -v "\->" | sed "s/.*\///g")
+    BRANCHES=$(git branch -r | grep $REMOTE | grep -v HEAD | grep -v master | sed "s/.*\///g")
     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
@@ -55,7 +55,7 @@ function push_all_branches () {
     REPO_DIR=$3
 
     pushd $REPO_DIR
-    BRANCHES=$(git branch -r | grep $REMOTE | grep -v "\->" | sed "s/.*\///g")
+    BRANCHES=$(git branch -r | grep $REMOTE | grep -v HEAD | grep -v master | sed "s/.*\///g")
     popd > /dev/null
 
     run "git push $REMOTE master:master" ${REPO_DIR}