This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 32919ba1076136435c7ebcd82fe0a932ac570ebe Author: Mihai Moldovan <ionic@ionic.de> Date: Fri Aug 17 15:51:26 2018 +0200 bin/build-rpm-package: port sbuild-deb-package changes over, even though we currently do not use upstream/* branches there. --- bin/build-rpm-package | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/bin/build-rpm-package b/bin/build-rpm-package index e8f0728..88146e2 100755 --- a/bin/build-rpm-package +++ b/bin/build-rpm-package @@ -752,10 +752,14 @@ prepare_workspace() { cd "${PROJECT_DIR}" && { git reset --hard git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" - git fetch origin "${CHECKOUT}" + git fetch 'origin' "${CHECKOUT}" git reset --hard "origin/${CHECKOUT}" - git fetch origin upstream:upstream || true - git fetch origin pristine-tar:pristine-tar || true + git branch -D 'upstream' || true + git fetch 'origin' 'upstream:upstream' || true + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true + git fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git branch -D 'pristine-tar' || true + git fetch 'origin' 'pristine-tar:pristine-tar' || true # and again, get the ${CHECKOUT} refspec in pure state git reset --hard git clean -df @@ -768,8 +772,12 @@ prepare_workspace() { git clone "git://${GIT_HOSTNAME}/${PROJECT_PATH}.git" cd "${PROJECT}" git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}" - git fetch origin upstream:upstream || true - git fetch origin pristine-tar:pristine-tar || true + git branch -D 'upstream' || true + git fetch 'origin' 'upstream:upstream' || true + git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true + git fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true + git branch -D 'pristine-tar' || true + git fetch 'origin' 'pristine-tar:pristine-tar' || true git clean -df } || { echo "Unable to switch to project directory \"$(dirname "${PROJECT_DIR}")\". Does it exist? Check the permissions." >&2 -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git