[tor-commits] [tor/master] Modify gitlab-ci for mirroring

[nickm@xxxxxxxxxxxxxx]

commit ef03aa3f8ece80c8a7539c131efc4359eccf018c
Author: hiromipaw <hiro@xxxxxxxxxxxxxx>
Date:   Fri Sep 1 18:12:30 2017 +0200

    Modify gitlab-ci for mirroring
---
 .gitlab-ci.yml | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 45e3052e4..ef2847154 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,11 +30,9 @@ build:
 update:
   script: 
     - echo "merging from torgit"
-    - git clone git@xxxxxxxxxxx: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@xxxxxxxxxxx"
     - git config --global user.name "gitadmin"
-    - git pull -Xtheirs upstream master
-    - git push origin master
+    - git push --mirror git@xxxxxxxxxxx:hiro/tor.git



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits