This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 628629840202c5ac3679290d86d6a640e0ce769f Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 23 20:41:25 2015 +0100 git/hooks/update: make script generic to be used as update and update-merge (via symlink name). The latter name will allow merges. Use common.sh. --- git/hooks/update | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/git/hooks/update b/git/hooks/update index c4fdc78..e06d6d9 100755 --- a/git/hooks/update +++ b/git/hooks/update @@ -3,7 +3,14 @@ # Update hook for X2go Git projects # -. /srv/git/_hooks_/update-script._check_ -#. /srv/git/_hooks_/update-script._branches+tags_ -#. /srv/git/_hooks_/update-script._acl_ -. /srv/git/_hooks_/update-script._grant_ +. hooks/common.sh + +MERGE="0" +[[ "$(basename ${0})" = "update-merge" ]] && MERGE="1" + +[[ "${MERGE}" = "0" ]] && \ + . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check_" || \ + . "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._check+allow-merges_" +#. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._branches+tags_" +#. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._acl_" +. "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/update-script._grant_" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git