|
@@ -30,11 +30,9 @@ build:
|
|
update:
|
|
update:
|
|
script:
|
|
script:
|
|
- echo "merging from torgit"
|
|
- echo "merging from torgit"
|
|
- - git clone git@oniongit.eu:hiro/tor.git
|
|
+ - git clone --bare https://git.torproject.org/tor.git
|
|
- - "cd tor"
|
|
+ - "cd tor"
|
|
- - git remote add upstream https://git.torproject.org/tor.git
|
|
|
|
- git checkout master
|
|
- git checkout master
|
|
- git config --global user.email "labadmin@oniongit.eu"
|
|
- git config --global user.email "labadmin@oniongit.eu"
|
|
- git config --global user.name "gitadmin"
|
|
- git config --global user.name "gitadmin"
|
|
- - git pull -Xtheirs upstream master
|
|
+ - git push --mirror git@oniongit.eu:hiro/tor.git
|
|
- - git push origin master
|
|
|