This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository buildscripts. from 5fae500 bin/build-rpm-package: OBS is broken and doesn't recognize -b options passed after --stage. Use --stage=-b... as a workaround. new ca4d4fe bin/slave-sync.sh: don't fail on unmodified trees. The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: bin/slave-sync.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit ca4d4fef8fd6e8484c706e9f17e5d05b89c9af06 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Sep 7 07:53:45 2017 +0200 bin/slave-sync.sh: don't fail on unmodified trees. --- bin/slave-sync.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/slave-sync.sh b/bin/slave-sync.sh index f288282..a1737c1 100755 --- a/bin/slave-sync.sh +++ b/bin/slave-sync.sh @@ -5,6 +5,10 @@ set -e cd "${HOME}/buildscripts" # Allow modifications. -git stash +typeset -i modified_tree='0' +git diff-index --quiet "$(git write-tree)" -- +modified_tree="${?}" + +[[ "${modified_tree}" -ne "0" ]] && git stash git pull --rebase -git stash pop +[[ "${modified_tree}" -ne "0" ]] && git stash pop -- Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git
-
git-admin＠x2go.org