This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from d1347b3 bin/killstalevms.bash: make executable. new b19870e git/hooks: add common.sh sharing functions and variables for all hooks. new 2c86d6f git/hooks/post-receive: use common.sh and the variables defined there. new 6286298 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. The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Summary of changes: git/hooks/common.sh | 12 ++++++++++++ git/hooks/post-receive | 12 +++++++----- git/hooks/update | 15 +++++++++++---- 3 files changed, 30 insertions(+), 9 deletions(-) create mode 100755 git/hooks/common.sh -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit b19870ee6be0fa641aa35b5c6cfb0f6fa91bf201 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 23 20:36:03 2015 +0100 git/hooks: add common.sh sharing functions and variables for all hooks. --- git/hooks/common.sh | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/git/hooks/common.sh b/git/hooks/common.sh new file mode 100755 index 0000000..d40f2a7 --- /dev/null +++ b/git/hooks/common.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +if [[ "$(git rev-parse --is-bare-directory)" = "true" ]] then + GIT_REPO_NAME="$(basename "${PWD}")" + OUTSIDE_REPO="/../" +else + GIT_REPO_NAME="$(readlink -nf "${PWD}/..")" + OUTSIDE_REPO="/../../" +fi + +# GIT_DIR will always be the current repository's .git dir. +GIT_DIR="$(pwd)" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository maintenancescripts. commit 2c86d6fae16aee26d3dcdedb5b7f77651a3b8577 Author: Mihai Moldovan <ionic@ionic.de> Date: Mon Feb 23 20:37:04 2015 +0100 git/hooks/post-receive: use common.sh and the variables defined there. --- git/hooks/post-receive | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/git/hooks/post-receive b/git/hooks/post-receive index 673abcd..49241b7 100755 --- a/git/hooks/post-receive +++ b/git/hooks/post-receive @@ -12,10 +12,12 @@ # see contrib/hooks/ for a sample, or uncomment the next line and # rename the file to "post-receive". -GIT_REPO_URL=git://code.x2go.org/`pwd | sed 's:.*\/::'` -curl http://jenkins.x2go.org:8080/git/notifyCommit?url=$GIT_REPO_URL +. hooks/common.sh + +GIT_REPO_URL="git://code.x2go.org/${GIT_REPO_NAME}" +curl "http://jenkins.x2go.org:8080/git/notifyCommit?url=${GIT_REPO_URL}" exec /usr/bin/pee \ - "/srv/git/_hooks_/x2go-post-receive-tag-pending" \ - "/srv/git/_hooks_/x2go-post-receive-close-bugs" \ - "/srv/git/_hooks_/post-receive-email" + "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/x2go-post-receive-tag-pending" \ + "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/x2go-post-receive-close-bugs" \ + "${GIT_DIR}/${OUTSIDE_REPO}/_hooks_/post-receive-email" -- Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git
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
-
git-admin＠x2go.org