pmwg-ci: Don't merge the baseline branch on itselfv0.4

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

1 files changed, 5 insertions, 3 deletions

diff --git a/pmwg-ci-integ b/pmwg-ci-integ
index 2546477..df4474f 100755
--- a/pmwg-ci-integ
+++ b/pmwg-ci-integ
@@ -306,7 +306,6 @@ do_remove_old() {
 
     for REMOTE_NAME in $(git remote); do
 
-
 	RBRANCH=$(git remote show $REMOTE_NAME | grep tracked | awk '{ print $1 }')
 	RURL=$(git remote -v | grep "^$REMOTE_NAME\b" | grep fetch | awk '{ print $2 }')
 	FOUND=0
@@ -321,7 +320,7 @@ do_remove_old() {
 		FOUND=1
 	    fi
 	done < $CONFIG
-	
+
 	if [ $FOUND -eq 1 ]; then
 	    continue
 	fi
@@ -484,11 +483,14 @@ MERGED=0
 while read LINE; do
 
     echo $LINE | egrep -q '(^#|^\s*$|^\s*\t*#)' && continue
-
     REMOTE_NAME=$(echo $LINE | awk '{ print $1 }')
     REMOTE_URL=$(echo $LINE | awk '{print $2}')
     REMOTE_BRANCH=$(echo $LINE | awk '{print $3}')
 
+    if [ "$REMOTE_NAME" = "$BASELINE" ]; then
+	continue
+    fi
+
     echo "Merging $REMOTE_NAME/$REMOTE_BRANCH"
 
     git merge --no-ff --no-edit $REMOTE_NAME/$REMOTE_BRANCH