Modify gitlab-ci for mirroring

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45e3052e40ba88a1505eb4ab5c3b3df121c354cf..ef28471549ec4fa110483390b7cdae6699e89e01 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,11 +30,9 @@ build:
 update:
   script: 
     - echo "merging from torgit"
-    - git clone git@oniongit.eu:hiro/tor.git
-    - "cd tor"
-    - git remote add upstream https://git.torproject.org/tor.git
+    - git clone --bare https://git.torproject.org/tor.git
+    - "cd tor" 
     - git checkout master
     - git config --global user.email "labadmin@oniongit.eu"
     - git config --global user.name "gitadmin"
-    - git pull -Xtheirs upstream master
-    - git push origin master
+    - git push --mirror git@oniongit.eu:hiro/tor.git