[X2Go-Commits] [buildscripts] 01/01: bin/slave-sync.sh: don't fail on unmodified trees.

[git-admin at x2go.org]

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 at 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