From 37ff7fc842362180c5eef6e7f5b9c68aad0177da Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 13 Oct 2011 18:43:20 +0200 Subject: [PATCH] some repos like yum don't have a master --- scripts/git-mirror.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/git-mirror.sh b/scripts/git-mirror.sh index 3ff06f5..1f2a5b9 100755 --- a/scripts/git-mirror.sh +++ b/scripts/git-mirror.sh @@ -105,10 +105,11 @@ function merge_all_branches () { pushd $REPO_DIR > /dev/null BRANCHES=$(git branch -r | grep $REMOTE | grep -v HEAD | sed "s/.*\///g" | grep -v master) + HAS_MASTER=$(git branch -l | grep master) popd > /dev/null - run ${REPO_DIR} git checkout master - run ${REPO_DIR} git merge --ff $REMOTE/master + [ -n "$HAS_MASTER" ] && run ${REPO_DIR} git checkout master + [ -n "$HAS_MASTER" ] && run ${REPO_DIR} git merge --ff $REMOTE/master for BRANCH in $BRANCHES ; do run -i ${REPO_DIR} git branch $BRANCH $REMOTE/$BRANCH run ${REPO_DIR} git checkout $BRANCH @@ -124,9 +125,10 @@ function push_all_branches () { pushd $REPO_DIR > /dev/null BRANCHES=$(git branch -r | grep $PUSH_FROM | grep -v HEAD | sed "s/.*\///g" | grep -v master) + HAS_MASTER=$(git branch -l | grep master) popd > /dev/null - run ${REPO_DIR} git push $PUSH_TO master:master + [ -n "$HAS_MASTER" ] && run ${REPO_DIR} git push $PUSH_TO master:master for BRANCH in $BRANCHES ; do run ${REPO_DIR} git push $PUSH_TO $BRANCH:$BRANCH done -- 2.43.0