X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=shell%2Fgerrit-branch-lock.sh;h=88f5a22f160edf4050706bb61603f6aaa97ab49b;hb=a5fa8a32ab2f856fecc7505fdfd7a8e12df2c402;hp=64d6ec9c30bc3cfa4f9925d310f6b0ef20447b66;hpb=df6bd253f8332cbc9454e61f3a323e0cea2b1ebd;p=releng%2Fglobal-jjb.git

diff --git a/shell/gerrit-branch-lock.sh b/shell/gerrit-branch-lock.sh
index 64d6ec9c..88f5a22f 100644
--- a/shell/gerrit-branch-lock.sh
+++ b/shell/gerrit-branch-lock.sh
@@ -8,6 +8,7 @@
 # which accompanies this distribution, and is available at
 # http://www.eclipse.org/legal/epl-v10.html
 ##############################################################################
+echo "---> gerrit-branch-lock.sh"
 # Generates a patch to lock|unlock a branch in Gerrit
 #
 # Assumes that the project repository was cloned via ssh and thus uses ssh to
@@ -25,7 +26,7 @@ install_gerrit_hook() {
     ssh_port=$(git remote show origin | grep Fetch | grep 'ssh://' \
         | awk -F'/' '{print $3}' | awk -F':' '{print $2}')
 
-    if [ -z $ssh_url ]; then
+    if [ -z "$ssh_url" ]; then
         echo "ERROR: Gerrit SSH URL not found."
         exit 1
     fi
@@ -38,20 +39,26 @@ install_gerrit_hook
 # Groups must be mapped in the groups file before they can be used
 if ! grep 'Registered Users'; then
     echo -e "global:Registered-Users\tRegistered Users" >> groups
+    git add groups
 fi
 
 mode=$(echo "$GERRIT_EVENT_COMMENT_TEXT" | grep branch | awk '{print $1}')
 case $mode in
     lock)
         echo "Locking branch: $GERRIT_BRANCH"
-        git config -f project.config "access.refs/heads/${GERRIT_BRANCH}.exclusiveGroupPermissions" "submit"
-        git config -f project.config "access.refs/heads/${GERRIT_BRANCH}.submit" "block group Registered Users"
+        git config -f project.config \
+            "access.refs/heads/${GERRIT_BRANCH}.exclusiveGroupPermissions" \
+            "submit"
+        git config -f project.config \
+            "access.refs/heads/${GERRIT_BRANCH}.submit" \
+            "block group Registered Users"
         git commit -asm "Lock branch $GERRIT_BRANCH"
         ;;
 
     unlock)
         echo "Unlocking branch: $GERRIT_BRANCH"
-        git config -f project.config --remove-section "access.refs/heads/${GERRIT_BRANCH}" || true
+        git config -f project.config --remove-section \
+            "access.refs/heads/${GERRIT_BRANCH}" || true
         git commit -asm "Unlock branch $GERRIT_BRANCH"
         ;;