tree da938b744d29d868188f75013bb5bc5069a23f2d
parent de79cb155d2a59ba446ee4ecd7b653dad40dccad
author Neels Hofmeyr <nhofmeyr@sysmocom.de> 1498182746 +0200
committer Neels Hofmeyr <nhofmeyr@sysmocom.de> 1498182746 +0200

jenkins-build-common.sh: fix being stuck on branch

It's hard to allow both branch names and git hashes. For a branch, we want to
prepend 'origin' to use the upstream branch. For a git hash, we don't.

We so far prepend 'origin/' if the current branch name doesn't resolve, but
that's not enough. If a local 'master' branch exists, we would stay on that
branch instead of origin/master.

Rather, prepend 'origin/' if 'origin/$branch' exists. Git hashes should not
exist as 'origin/123abc...' and used as-is, where branches from origin should
be updated to upstream by prepending 'origin/'.

Also create a local branch to build. Always force-remove the branch and
re-create from the origin/name or git hash. Keep the reset --hard for paranoia.

Change-Id: I2e610b357f8559c6b6ffb544eb0a952f04dd9f70