[X2Go-Commits] [maintenancescripts] 03/04: git/hooks: delete redundant update-script._check+allow-merges_ script.

[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 maintenancescripts.

commit cf689b0fb539f960a17fbab4b6e795418cc95523
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Feb 23 23:07:10 2015 +0100

    git/hooks: delete redundant update-script._check+allow-merges_ script.
---
 git/hooks/update-script._check+allow-merges_ |   49 --------------------------
 1 file changed, 49 deletions(-)

diff --git a/git/hooks/update-script._check+allow-merges_ b/git/hooks/update-script._check+allow-merges_
deleted file mode 100755
index bb906c9..0000000
--- a/git/hooks/update-script._check+allow-merges_
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-
-. hooks/common.sh
-
-case "$1" in
-  refs/tags/*)
-    [ -f "$GIT_DIR/$1" ] && deny >/dev/null "You can't overwrite an existing tag"
-    ;;
-  refs/heads/*)
-    BRANCH="${1#refs/heads/}"
-
-    # No rebasing or rewinding on release, build or master branches.
-    if expr "$2" : '0*$' >/dev/null; then
-      case "${BRANCH}" in
-        release/*|build-*|master|feature/*|bugfix/*) info "The branch '$1' is new..." ;;
-        *) deny >/dev/null "ERROR: Branch name does not meet the project policies. Please contact git-admin at x2go.org." ;;
-      esac
-    else
-      case "${BRANCH}" in
-        release/*|build-*|master)
-          # updating -- make sure it contains no merge commits
-          [ -n "$(git rev-list --merges $2..$3)" ] && echowarn "WARNING: update contains a merge. Allowing merges by special policies for this project."
-
-          # updating -- make sure it is a fast forward
-          mb=$(git merge-base "$2" "$3")
-          case "$mb,$2" in
-            "$2,$mb") info "Update is fast-forward" ;;
-            *)        deny > /dev/null "ERROR: This is not a fast-forward update. History has been rewritten." ;;
-          esac
-          ;;
-        feature/*|bugfix/*) info "Not checking for non-fast-forwards or merges on ${BRANCH}." ;;
-        *) deny >/dev/null "ERROR: Branch name does not meet the project policies. Please contact git-admin at x2go.org." ;;
-      esac
-    fi
-    for REVISION in $(git rev-list --reverse "$2..$3") ; do
-      # Make sure that the log message contains some text.
-      check_log_message
-
-      # Enforce some style guidelines on commits: Trailing whitespace, tabs (outside
-      # of Makefiles) and DOS line endings are forbidden, all files must end in
-      # newlines.
-      check_trailing_whitespace ""
-      check_tabs ""
-      check_dos_linebreaks ""
-      check_ending_newline ""
-    done
-    ;;
-esac
-

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/maintenancescripts.git