ci-merge: fix a problem of not merged remote into integration branch

If there are two remotes and one of their remote names matches another
one as a regexp pattern, then it will not be added as a new remote.
This condition is met, when one remote name is a substring of another,
and it may result in a missing merge of a remote branch.

The problem is encountered by me, but the fix is attributed to Dmitry
Baryshkov.

Signed-off-by: Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/ci-merge b/ci-merge
index 7704f5b..d59821f 100755
--- a/ci-merge
+++ b/ci-merge
@@ -489,7 +489,7 @@ do_add_new() {
 	REMOTE_URL=$(echo $LINE | awk '{print $2}')
 	REMOTE_BRANCH=$(echo $LINE | awk '{print $3}')
 
-	git remote | grep -q "$REMOTE_NAME"
+	git remote | grep -q "^$REMOTE_NAME$"
 	if [ $? -ne 0 ]; then
 	    echo "Adding remote $REMOTE_NAME $REMOTE_URL $REMOTE_BRANCH"
 	    git remote add -f -t $REMOTE_BRANCH $REMOTE_NAME $REMOTE_URL