[X2Go-Commits] [buildscripts] 01/01: bin/slave-sync.sh: seriously don't bail out if the working tree is clean.

git-admin at x2go.org git-admin at x2go.org
Thu Sep 7 08:03:48 CEST 2017


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 2c9dd487ab4ec3ef7809d99fdc417b2b4f3eadad
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Sep 7 08:03:43 2017 +0200

    bin/slave-sync.sh: seriously don't bail out if the working tree is clean.
---
 bin/slave-sync.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/bin/slave-sync.sh b/bin/slave-sync.sh
index a1737c1..b76e9ca 100755
--- a/bin/slave-sync.sh
+++ b/bin/slave-sync.sh
@@ -6,8 +6,7 @@ cd "${HOME}/buildscripts"
 
 # Allow modifications.
 typeset -i modified_tree='0'
-git diff-index --quiet "$(git write-tree)" --
-modified_tree="${?}"
+git diff-index --quiet "$(git write-tree)" -- || modified_tree="${?}"
 
 [[ "${modified_tree}" -ne "0" ]] && git stash
 git pull --rebase

--
Alioth's /srv/git/code.x2go.org/buildscripts.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/buildscripts.git


More information about the x2go-commits mailing list