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

Fix branchname (#176)

Browse source 
Do not assume <blank> is same as master on stone age versions of git
This commit is contained in:
Alex Malinovich 2017-03-07 21:58:47 -08:00 • committed by Henric Andersson
parent 37f75bcd32
commit bcc96e354a
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plexupdate.sh
View file

@ -229,7 +229,7 @@ if [ "${AUTOUPDATE}" = "yes" ]; 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
# 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)
if git fetch origin $BRANCHNAME --quiet && ! git diff --quiet FETCH_HEAD; then if git fetch origin ${BRANCHNAME:-master} --quiet && ! git diff --quiet FETCH_HEAD; then
info "Auto-updating..." info "Auto-updating..."
# Use an associative array to store permissions. If you're running bash < 4, the declare will fail and we'll # Use an associative array to store permissions. If you're running bash < 4, the declare will fail and we'll