aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAníbal Limón <anibal.limon@linaro.org>2018-04-06 11:23:14 -0500
committerAníbal Limón <anibal.limon@linaro.org>2018-04-17 10:04:15 -0500
commitcb97377b1be30ce82a165abc13cd07de8e1fc613 (patch)
treec1a8d6944e488f0f82b8f1aa2f7d91aea7b87e2a
parent12e88adda11015705fb7c88135c9df54d0793c20 (diff)
ci-merge: Add support for push integ history branch
When a new integ branch is made the old one is renamed to keep history so push it also in remote repository. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org>
-rwxr-xr-xci-merge6
1 files changed, 6 insertions, 0 deletions
diff --git a/ci-merge b/ci-merge
index 13b4185..cc37b3b 100755
--- a/ci-merge
+++ b/ci-merge
@@ -91,6 +91,7 @@ REMOTE_REPO="ssh://git@git.linaro.org/power/linux.git"
# The integration branch
INTEG_BRANCH="integ"
+INTEG_BRANCH_NEW_NAME=""
# The baseline remote repo
BASELINE="baseline"
@@ -546,4 +547,9 @@ echo -n "Push branch to $REMOTE_INTEG_BRANCH [Y/n]? "
read RES
if [ "${RES,,}" == "y" -o "$RES" == "" ]; then
git push -f $REMOTE_INTEG_BRANCH
+
+ if [ ! -z $INTEG_BRANCH_NEW_NAME ]; then
+ REMOTE_INTEG_BRANCH_NEW_NAME="$REMOTE_REPO $INTEG_BRANCH_NEW_NAME"
+ git push $REMOTE_INTEG_BRANCH_NEW_NAME
+ fi
fi