github/plexupdate
1
0
Fork 0
mirror of https://github.com/mrworf/plexupdate.git synced 2025-07-31 12:00:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stay on current branch unless BRANCHNAME is set

Browse source
This commit is contained in:
Alex Malinovich 2018-03-10 14:07:03 -08:00
parent 306edf9d0d
commit 6a882a8ad3
No known key found for this signature in database
GPG key ID: F3327D1AA93CF5F0
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
plexupdate.sh
View file

@ -228,8 +228,9 @@ if [ "${AUTOUPDATE}" = "yes" ]; then
elif ! git diff --quiet; then elif ! git diff --quiet; then
warn "You have made changes to the plexupdate files, cannot auto update" warn "You have made changes to the plexupdate files, cannot auto update"
else else
BRANCHNAME="${BRANCHNAME:-master}" if [ -z "${BRANCHNAME}" ]; then
if [ "${BRANCHNAME}" != "$(git symbolic-ref -q --short HEAD)" ]; then BRANCHNAME="$(git symbolic-ref -q --short HEAD)"
elif [ "${BRANCHNAME}" != "$(git symbolic-ref -q --short HEAD)" ]; then
git checkout "${BRANCHNAME}" git checkout "${BRANCHNAME}"
fi fi
# Force FETCH_HEAD to point to the correct branch (for older versions of git which don't default to current branch) # Force FETCH_HEAD to point to the correct branch (for older versions of git which don't default to current branch)