[X2Go-Commits] [maintenancescripts] 01/01: git/hooks/update-script._check_: fix typo in merge-allowance detection.

[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 b9165f68e44daf37a99a17733e265ba6515dd757
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Sep 29 04:10:48 2018 +0200

    git/hooks/update-script._check_: fix typo in merge-allowance detection.
---
 git/hooks/update-script._check_ | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git/hooks/update-script._check_ b/git/hooks/update-script._check_
index 7810f92..c4ce1ed 100755
--- a/git/hooks/update-script._check_
+++ b/git/hooks/update-script._check_
@@ -7,7 +7,7 @@ if [ -z "${UPDATE_DONE}" ]; then
 
   MERGE="0"
   typeset script_basename="$(basename "${BASH_SOURCE[0]}")"
-  [ "${script_basename}" = "update-script_check+allow-merges_" ] && MERGE="1"
+  [ "${script_basename}" = "update-script._check+allow-merges_" ] && MERGE="1"
 
   case "${1}" in
     (refs/tags/*)

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