ci-merge: Allow local overrides

Add support for local overrides in order to be able to rebase branches
and iteratively try to build up and test the merged branch. Each remote
being merged in can be overridden by a local branch named
"override/<remote>"

This makes it possible to create a bunch of local override branches,
prepare the rr-cache, build, boot test and then push all pieces at once.

Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Signed-off-by: Amit Kucheria <amit.kucheria@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

1 files changed, 9 insertions, 2 deletions

diff --git a/ci-merge b/ci-merge
index 28f0ff8..05516d7 100755
--- a/ci-merge
+++ b/ci-merge
@@ -620,9 +620,16 @@ while read LINE; do
 	continue
     fi
 
-    echo "Merging $REMOTE_NAME/$REMOTE_BRANCH"
+    git rev-parse --quiet --verify "override/$REMOTE_NAME"
+    if [ $? -eq 0 ]; then
+        MERGER="override/$REMOTE_NAME"
+    else
+        MERGER="$REMOTE_NAME/$REMOTE_BRANCH"
+    fi
+
+    echo "Merging $MERGER"
 
-    git merge -q --no-ff --no-edit $REMOTE_NAME/$REMOTE_BRANCH
+    git merge -q --no-ff --no-edit $MERGER
     if [ $? -ne 0 ]; then
         if [ -z $DISPLAY ]; then
             # try to commit, may be resolved by rerere