From 03f424e45df119bf52cb603854fe4d12c93dcdc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Thu, 21 Feb 2019 10:18:52 +0200
Subject: ci: Cope with the fact that the "upstream" remote might already exist

Remove the old "upstream" remote if set, to make sure it points to the
right repo.
---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to '.gitlab-ci.yml')

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 41fcab5..b206c40 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,9 @@ style-check:
         - amd64
     script:
         - git grep -n -P "\t|\r| $" -- . ':(exclude)*/compat/*' && exit 1
-        - git remote add upstream https://code.videolan.org/videolan/dav1d.git && git fetch -q upstream master
+        - git remote rm upstream 2> /dev/null
+        - git remote add upstream https://code.videolan.org/videolan/dav1d.git
+        - git fetch -q upstream master
         - for i in $(git rev-list HEAD ^upstream/master); do
               echo "Checking commit message of $i";
               msg="$(git log --format=%B -n 1 $i)";
-- 
cgit v1.2.3