From: Matous Holinka <matous.holinka@nic.cz>
Date: Thu, 7 Nov 2019 14:55:34 +0000 (+0100)
Subject: bird: .git was updated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a07ebed2d85ace3db7498050b3e0bdd618a6460;p=thirdparty%2Fbird.git

bird: .git was updated
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cfcb3bb81..f91b619f6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -300,7 +300,7 @@ build-birdlab:
     - DIR=$(pwd)
     - cd /var/lib/gitlab-runner/bird-tools
     - sudo git clean -fx
-    - git pull
+    - git pull --ff-only
     - mv $DIR/bird $DIR/birdc bird-tools/netlab-int/common
   tags:
     - birdlab