Commit 2b1aef6e authored by Kevin Daudt's avatar Kevin Daudt

build.sh: force overwrite basebranch

The basebranch might already exist. When trying to update the basebranch
when it's not fast-forwardable, git will throw an error.

Add a '+' to the fetch spec to tell git that it's allowed to force
overwrite the current ref.
parent 40de67a8
Pipeline #241 passed with stages
in 3 minutes and 21 seconds
......@@ -106,7 +106,7 @@ failed=
sysinfo || true
setup_system || die "Failed to setup system"
git fetch origin refs/heads/$BASEBRANCH:refs/heads/$BASEBRANCH
git fetch origin +refs/heads/$BASEBRANCH:refs/heads/$BASEBRANCH
for repo in $(changed_repos); do
set_repositories_for "$repo"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment