diff --git a/roles/distgit/files/setup_git_package b/roles/distgit/files/setup_git_package index df76927300..4b30d5aebd 100644 --- a/roles/distgit/files/setup_git_package +++ b/roles/distgit/files/setup_git_package @@ -108,16 +108,6 @@ git commit -q -m 'Initial setup of the repo' --author "$AUTHOR" git push -q origin master popd >/dev/null -# Setup our update hooks -#mkdir -p $GITROOT/$PACKAGE.git/hooks/update-chained.d -#ln -s /etc/gitolite/hooks/common/update \ -# $GITROOT/$PACKAGE.git/hooks/update-chained.d/update-gitolite -#ln -s /usr/share/git-core/update-block-push-origin \ -# $GITROOT/$PACKAGE.git/hooks/update-chained.d/update-block-push-origin - -# This one kicks off all the others in update-chained.d -#ln -s /usr/share/git-core/update-chained $GITROOT/$PACKAGE.git/hooks/update - # Place the gitolite update hook in place since we're not using our own ln -s /etc/gitolite/hooks/common/update $GITROOT/$PACKAGE.git/hooks/update diff --git a/roles/git/hooks/files/update-chained b/roles/git/hooks/files/update-chained deleted file mode 100644 index 6062f4bf9c..0000000000 --- a/roles/git/hooks/files/update-chained +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - - -refname="${1}" -sha1_old="${2}" -sha1_new="${3}" - - -$GIT_DIR/hooks/update-chained.d/update-gitolite "$refname" "$sha1_old" "$sha1_new" || exit 1 -$GIT_DIR/hooks/update-chained.d/update-block-push-origin "$refname" "$sha1_old" "$sha1_new" || exit 1 - -exit 0 diff --git a/roles/git/hooks/tasks/main.yml b/roles/git/hooks/tasks/main.yml index 84a049622f..ff17b80e93 100644 --- a/roles/git/hooks/tasks/main.yml +++ b/roles/git/hooks/tasks/main.yml @@ -14,7 +14,6 @@ - post-receive-fedmsg - post-receive-chained - update-block-push-origin - - update-chained - name: install the git mail hooks copy: src={{item}} dest=/usr/share/git-core/mail-hooks/ mode=0755