diff --git a/gather.sh b/gather.sh index 659b45d..0f58026 100644 --- a/gather.sh +++ b/gather.sh @@ -16,22 +16,25 @@ for i in {1..3}; do echo ${name} echo ${url} - git remote add $name $url - git fetch $name - git checkout 2.0 - git merge --no-edit --allow-unrelated-histories $name/2.0 - git checkout 2.0-fixed - git merge --no-edit --allow-unrelated-histories $name/2.0-fixed - git checkout 2.0-upstream - git merge --no-edit --allow-unrelated-histories $name/2.0-upstream - git checkout 1.0 - git merge --no-edit --allow-unrelated-histories $name/1.0 - git checkout 1.0-fixed - git merge --no-edit --allow-unrelated-histories $name/1.0-fixed - git checkout 1.0-upstream - git merge --no-edit --allow-unrelated-histories $name/1.0-upstream - git remote remove $name - git gc --prune=now + if [ $name != 'l10n_switzerland' ] + then + git remote add $name $url + git fetch $name + git checkout 2.0 + git merge --no-edit --allow-unrelated-histories $name/2.0 + git checkout 2.0-fixed + git merge --no-edit --allow-unrelated-histories $name/2.0-fixed + git checkout 2.0-upstream + git merge --no-edit --allow-unrelated-histories $name/2.0-upstream + git checkout 1.0 + git merge --no-edit --allow-unrelated-histories $name/1.0 + git checkout 1.0-fixed + git merge --no-edit --allow-unrelated-histories $name/1.0-fixed + git checkout 1.0-upstream + git merge --no-edit --allow-unrelated-histories $name/1.0-upstream + git remote remove $name + git gc --prune=now + fi done done git push --all \ No newline at end of file