From: Barış Metin <Talip-Baris.Metin@sophia.inria.fr>
Date: Fri, 2 Jul 2010 16:30:40 +0000 (+0200)
Subject: don't filter out local_master fist
X-Git-Tag: foo~86^2~1
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c79129bcc854580d7050d1743e2ab3ca3a30216b;p=infrastructure.git

don't filter out local_master fist
---

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