From d680164f11dbec9ad593c55030387b0bbf1a116d Mon Sep 17 00:00:00 2001 From: Philippe Kueck Date: Fri, 10 Mar 2017 18:46:32 +0100 Subject: [PATCH 1/2] fix #1189, commit messages containing a pipe --- models/graph.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/models/graph.go b/models/graph.go index 7413f409de861..cfd583ca8b93c 100644 --- a/models/graph.go +++ b/models/graph.go @@ -78,8 +78,8 @@ func graphItemFromString(s string, r *git.Repository) (GraphItem, error) { return GraphItem{}, fmt.Errorf("Failed parsing grap line:%s. Expect 1 or two fields", s) } - rows := strings.Split(data, "|") - if len(rows) != 8 { + rows := strings.SplitN(data, "|", 8) + if len(rows) < 8 { return GraphItem{}, fmt.Errorf("Failed parsing grap line:%s - Should containt 8 datafields", s) } From 957c7c5970700980a4c1e47e834920a5d8e03390 Mon Sep 17 00:00:00 2001 From: Philippe Kueck Date: Wed, 15 Mar 2017 00:02:43 +0100 Subject: [PATCH 2/2] issue #1250, replace {pre,post}-receive and update hooks with a single shell script that does not require custom hooks to be a sh-script --- models/repo.go | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/models/repo.go b/models/repo.go index d44f4ba4899c9..878347613e4a3 100644 --- a/models/repo.go +++ b/models/repo.go @@ -845,11 +845,7 @@ func cleanUpMigrateGitConfig(configPath string) error { func createDelegateHooks(repoPath string) (err error) { var ( hookNames = []string{"pre-receive", "update", "post-receive"} - hookTpls = []string{ - fmt.Sprintf("#!/usr/bin/env %s\nORI_DIR=`pwd`\nSHELL_FOLDER=$(cd \"$(dirname \"$0\")\";pwd)\ncd \"$ORI_DIR\"\nfor i in `ls \"$SHELL_FOLDER/pre-receive.d\"`; do\n sh \"$SHELL_FOLDER/pre-receive.d/$i\"\ndone", setting.ScriptType), - fmt.Sprintf("#!/usr/bin/env %s\nORI_DIR=`pwd`\nSHELL_FOLDER=$(cd \"$(dirname \"$0\")\";pwd)\ncd \"$ORI_DIR\"\nfor i in `ls \"$SHELL_FOLDER/update.d\"`; do\n sh \"$SHELL_FOLDER/update.d/$i\" $1 $2 $3\ndone", setting.ScriptType), - fmt.Sprintf("#!/usr/bin/env %s\nORI_DIR=`pwd`\nSHELL_FOLDER=$(cd \"$(dirname \"$0\")\";pwd)\ncd \"$ORI_DIR\"\nfor i in `ls \"$SHELL_FOLDER/post-receive.d\"`; do\n sh \"$SHELL_FOLDER/post-receive.d/$i\"\ndone", setting.ScriptType), - } + hookTpl = fmt.Sprintf("#!/usr/bin/env %s\ndata=$(cat)\nexitcodes=()\nhookname=$(basename $0)\nGIT_DIR=${GIT_DIR:-$(dirname $0)}\n\nfor hook in ${GIT_DIR}/hooks/${hookname}.d/*; do\ntest -x \"${hook}\" || continue\necho \"${data}\" | \"${hook}\"\nexitcodes+=($?)\ndone\n\nfor i in \"${exitcodes[@]}\"; do\n[ \"${i}\" == 0 ] || exit ${i}\ndone\n", setting.ScriptType) giteaHookTpls = []string{ fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' pre-receive\n", setting.ScriptType, setting.AppPath, setting.CustomConf), fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' update $1 $2 $3\n", setting.ScriptType, setting.AppPath, setting.CustomConf), @@ -868,7 +864,7 @@ func createDelegateHooks(repoPath string) (err error) { } // WARNING: This will override all old server-side hooks - if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil { + if err = ioutil.WriteFile(oldHookPath, []byte(hookTpl), 0777); err != nil { return fmt.Errorf("write old hook file '%s': %v", oldHookPath, err) }