diff options
| author | QMK Bot <hello@qmk.fm> | 2021-08-29 00:52:22 +0000 |
|---|---|---|
| committer | QMK Bot <hello@qmk.fm> | 2021-08-29 00:52:22 +0000 |
| commit | 1ac3b3e9b6e794669db91d6d14c90b420b56bc26 (patch) | |
| tree | 3426bc996060c673910ee56e7ea30adef8ce9ce4 | |
| parent | 7b8cdfc19def74a982a842a5131c011ee23b024a (diff) | |
| parent | dd8922d48269a0664e840d6b6a537b8b91c1826b (diff) | |
Merge remote-tracking branch 'origin/master' into develop
| -rwxr-xr-x | util/update_chibios_mirror.sh | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/util/update_chibios_mirror.sh b/util/update_chibios_mirror.sh index d4593a8432..83aee22817 100755 --- a/util/update_chibios_mirror.sh +++ b/util/update_chibios_mirror.sh @@ -10,7 +10,7 @@ chibios_branches="trunk stable_20.3.x stable_21.6.x" chibios_tags="ver20.3.1 ver20.3.2 ver20.3.3 ver21.6.0" # The ChibiOS-Contrib branches to mirror -contrib_branches="master chibios-20.3.x" +contrib_branches="chibios-20.3.x" ################################ # Actions @@ -38,6 +38,9 @@ fi if [[ -z "$(cat "$chibios_git_config" | grep '\[remote "qmk"\]')" ]] ; then git remote add qmk git@github.com:qmk/ChibiOS.git git remote set-url qmk git@github.com:qmk/ChibiOS.git --push +else + git remote set-url qmk git@github.com:qmk/ChibiOS.git + git remote set-url qmk git@github.com:qmk/ChibiOS.git --push fi echo "Updating remotes..." @@ -65,11 +68,17 @@ cd "$contrib_dir" if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "qmk"\]')" ]] ; then git remote add qmk git@github.com:qmk/ChibiOS-Contrib.git git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git --push +else + git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git + git remote set-url qmk git@github.com:qmk/ChibiOS-Contrib.git --push fi if [[ -z "$(cat "$contrib_git_config" | grep '\[remote "upstream"\]')" ]] ; then git remote add upstream git@github.com:ChibiOS/ChibiOS-Contrib.git git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git --push +else + git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git + git remote set-url upstream git@github.com:ChibiOS/ChibiOS-Contrib.git --push fi echo "Updating remotes..." |