diff options
| -rw-r--r-- | .gitlab-ci.yml | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 45e3052e40..ef28471549 100644 --- 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 |