[X2Go-Commits] [buildscripts] 04/05: bin/sbuild-deb-package: quoting changes only.
git-admin at x2go.org
git-admin at x2go.org
Fri Aug 17 15:51:44 CEST 2018
This is an automated email from the git hooks/post-receive script.
x2go pushed a commit to branch master
in repository buildscripts.
commit f2a4fdf45e290cf76b8e0544d71675e0d0973261
Author: Mihai Moldovan <ionic at ionic.de>
Date: Fri Aug 17 15:47:46 2018 +0200
bin/sbuild-deb-package: quoting changes only.
---
bin/sbuild-deb-package | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 06f23fc..f49bf8b 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -175,14 +175,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 branch -D 'upstream' || true
- git fetch origin 'upstream: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 fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true
git branch -D 'pristine-tar' || true
- git fetch origin 'pristine-tar: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
@@ -194,14 +194,14 @@ prepare_workspace() {
cd "$(dirname "${PROJECT_DIR}")" && {
git clone "git://${GIT_HOSTNAME}/${PROJECT_PATH}.git"
cd "${PROJECT}"
- git fetch origin "${CHECKOUT}"
+ git fetch 'origin' "${CHECKOUT}"
git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}"
git branch -D 'upstream' || true
- git fetch origin 'upstream: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 fetch 'origin' 'refs/heads/upstream/*:refs/heads/upstream/*' || true
git branch -D 'pristine-tar' || true
- git fetch origin 'pristine-tar: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
More information about the x2go-commits
mailing list