This is an automated email from the git hooks/post-receive script. x2go pushed a change to branch master in repository maintenancescripts. from 48b7280 git/hooks: add update-merge symlink to make this function clear to users. new 5adcca2 git/hooks: delete update-merge symlink, won't work with git hooks. new 5217e99 git/hooks: add update-merge as real file, change update to reject merges and update-merge to accept merges. The 2 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/update | 7 +------ git/hooks/update-merge | 1 - 2 files changed, 1 insertion(+), 7 deletions(-) delete mode 120000 git/hooks/update-merge -- 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 5adcca23851ca1f2adce1f2d65bcfc2c32fa25c8 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 24 00:14:32 2015 +0100 git/hooks: delete update-merge symlink, won't work with git hooks. --- git/hooks/update-merge | 1 - 1 file changed, 1 deletion(-) diff --git a/git/hooks/update-merge b/git/hooks/update-merge deleted file mode 120000 index 77c430a..0000000 --- a/git/hooks/update-merge +++ /dev/null @@ -1 +0,0 @@ -update \ No newline at end of file -- 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 5217e99ecfa0050869fcc09191aa138e9d1f8a19 Author: Mihai Moldovan <ionic@ionic.de> Date: Tue Feb 24 00:16:06 2015 +0100 git/hooks: add update-merge as real file, change update to reject merges and update-merge to accept merges. --- git/hooks/update | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/git/hooks/update b/git/hooks/update index cfdc956..b18e2b0 100755 --- a/git/hooks/update +++ b/git/hooks/update @@ -5,12 +5,7 @@ . 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._check_" #. "${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