[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/update-script._check_: allow upstream/ prefix.

git-admin at x2go.org git-admin at x2go.org
Mon May 28 03:09:11 CEST 2018


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository maintenancescripts.

commit 467aed8512ec61ba6effc1182e175102d35182f5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon May 28 03:09:05 2018 +0200

    git/hooks/update-script._check_: allow upstream/ prefix.
---
 git/hooks/update-script._check_ | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/git/hooks/update-script._check_ b/git/hooks/update-script._check_
index 19ae208..63adcaf 100755
--- a/git/hooks/update-script._check_
+++ b/git/hooks/update-script._check_
@@ -18,7 +18,7 @@ if [ -z "${UPDATE_DONE}" ]; then
       # 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..." ;;
+          (release/*|build-*|master|feature/*|bugfix/*|upstream/*) 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
@@ -40,7 +40,7 @@ if [ -z "${UPDATE_DONE}" ]; then
               (*)        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}." ;;
+          (feature/*|bugfix/*|upstream/*) 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

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


More information about the x2go-commits mailing list