From 306edf9d0d322943998ed7b771a4c82c6a79b5e2 Mon Sep 17 00:00:00 2001 From: Alex Malinovich Date: Fri, 9 Mar 2018 01:11:39 -0800 Subject: [PATCH] Improved git branch handling for testing --- plexupdate.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/plexupdate.sh b/plexupdate.sh index df3e2ae..5b77b76 100755 --- a/plexupdate.sh +++ b/plexupdate.sh @@ -228,8 +228,12 @@ if [ "${AUTOUPDATE}" = "yes" ]; then elif ! git diff --quiet; then warn "You have made changes to the plexupdate files, cannot auto update" else + BRANCHNAME="${BRANCHNAME:-master}" + if [ "${BRANCHNAME}" != "$(git symbolic-ref -q --short HEAD)" ]; then + git checkout "${BRANCHNAME}" + fi # 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:-master} --quiet && ! git diff --quiet FETCH_HEAD; then + if git fetch origin ${BRANCHNAME} --quiet && ! git diff --quiet FETCH_HEAD; then info "Auto-updating..." # Use an associative array to store permissions. If you're running bash < 4, the declare will fail and we'll