This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 65a8d234ee31908d2c344aab780e86eca77140b0 Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Sep 7 08:33:40 2017 +0200 bin/slave-sync.sh: no, seriously don't fail. And also print the output. --- bin/slave-sync.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/bin/slave-sync.sh b/bin/slave-sync.sh index ac509da..db0188c 100755 --- a/bin/slave-sync.sh +++ b/bin/slave-sync.sh @@ -18,7 +18,9 @@ git_pull_retval="${?}" if [[ "${git_pull_retval}" -ne "0" ]]; then # git pull --rebase is stupid and sets its return value to 1 if the repository is up-to-date. Work around that with a stupid hack. typeset false_positive='Current branch master is up to date.' - [[ "${git_pull_output}" = "${false_positive}" ]] && exit "${git_pull_retval}" + [[ "${git_pull_output}" = "${false_positive}" ]] || exit "${git_pull_retval}" fi +echo "${git_pull_output}" + [[ "${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