This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository buildscripts. commit 7d7ce10b7e9e803dd50bd281f773f90d85ae732d Author: Mihai Moldovan <ionic@ionic.de> Date: Thu Sep 7 09:00:17 2017 +0200 bin/slave-sync.sh: turns out that git pull --rebase is actually behaving well, I just made a mistake. --- bin/slave-sync.sh | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/bin/slave-sync.sh b/bin/slave-sync.sh index 2234df9..e932b24 100755 --- a/bin/slave-sync.sh +++ b/bin/slave-sync.sh @@ -10,18 +10,7 @@ git diff-index --quiet "$(git write-tree)" -- || modified_tree="${?}" [[ "${modified_tree}" -ne "0" ]] && git stash -typeset git_pull_output='' -typeset -i git_pull_retval='0' -git_pull_output="$(LC_ALL=C LANG=C git pull --rebase)" -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}" -fi - -echo "${git_pull_output}" +git pull --rebase [[ "${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