From 832d10ce7583a01d74018ea9be56631f25a6e5af Mon Sep 17 00:00:00 2001 From: RD WebDesign Date: Thu, 7 Jul 2022 21:41:09 -0300 Subject: [PATCH] Run git reset before pulling, to avoid error on dirty master branch also adding line breaks for readability Signed-off-by: RD WebDesign --- automated install/basic-install.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/automated install/basic-install.sh b/automated install/basic-install.sh index a0a98b68c2..c745281cbe 100755 --- a/automated install/basic-install.sh +++ b/automated install/basic-install.sh @@ -592,17 +592,21 @@ update_repo() { pushd "${directory}" &> /dev/null || return 1 # Let the user know what's happening printf " %b %s..." "${INFO}" "${str}" + # Stash any local commits as they conflict with our working code git stash --all --quiet &> /dev/null || true # Okay for stash failure git clean --quiet --force -d || true # Okay for already clean directory - # Pull the latest commits - git pull --no-rebase --quiet &> /dev/null || return $? + # Check current branch. If it is master, then reset to the latest available tag. # In case extra commits have been added after tagging/release (i.e in case of metadata updates/README.MD tweaks) curBranch=$(git rev-parse --abbrev-ref HEAD) if [[ "${curBranch}" == "master" ]]; then git reset --hard "$(git describe --abbrev=0 --tags)" || return $? fi + + # Pull the latest commits + git pull --no-rebase --quiet &> /dev/null || return $? + # Show a completion message printf "%b %b %s\\n" "${OVER}" "${TICK}" "${str}" # Data in the repositories is public anyway so we can make it readable by everyone (+r to keep executable permission if already set by git)