From ce4581fed9a16649352bb841d240099741c9157a Mon Sep 17 00:00:00 2001 From: =?utf8?q?Bar=C4=B1=C5=9F=20Metin?= Date: Fri, 2 Jul 2010 17:51:09 +0200 Subject: [PATCH] fixes --- scripts/git-mirror.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh index e7af573..f60bd42 100755 --- 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} -- 2.43.0