Skip to content

Commit 2482c67

Browse files
philfrylunny
authored andcommitted
backport of PR #1257 for release/v1.1: rewrite pre-commit, post-commit and options hooks (#1376)
* 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 * issue #1250, make script posix compilant * v23, add migration script to update {pre,post}-receive and update hooks * migration: use a more common name and rename v23 to v26 to avoid conflicts * gofmt'ed and added copyright header * fix SyncRepositoryHooks to also sync wiki repos * no migration for you.
1 parent d9bdf7a commit 2482c67

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

models/repo.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -845,11 +845,7 @@ func cleanUpMigrateGitConfig(configPath string) error {
845845
func createDelegateHooks(repoPath string) (err error) {
846846
var (
847847
hookNames = []string{"pre-receive", "update", "post-receive"}
848-
hookTpls = []string{
849-
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),
850-
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),
851-
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),
852-
}
848+
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=\"${exitcodes} $?\"\ndone\n\nfor i in ${exitcodes}; do\n[ ${i} -eq 0 ] || exit ${i}\ndone\n", setting.ScriptType)
853849
giteaHookTpls = []string{
854850
fmt.Sprintf("#!/usr/bin/env %s\n\"%s\" hook --config='%s' pre-receive\n", setting.ScriptType, setting.AppPath, setting.CustomConf),
855851
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) {
868864
}
869865

870866
// WARNING: This will override all old server-side hooks
871-
if err = ioutil.WriteFile(oldHookPath, []byte(hookTpls[i]), 0777); err != nil {
867+
if err = ioutil.WriteFile(oldHookPath, []byte(hookTpl), 0777); err != nil {
872868
return fmt.Errorf("write old hook file '%s': %v", oldHookPath, err)
873869
}
874870

@@ -1909,6 +1905,11 @@ func SyncRepositoryHooks() error {
19091905
if err := createDelegateHooks(bean.(*Repository).RepoPath()); err != nil {
19101906
return fmt.Errorf("SyncRepositoryHook: %v", err)
19111907
}
1908+
if bean.(*Repository).HasWiki() {
1909+
if err := createDelegateHooks(bean.(*Repository).WikiPath()); err != nil {
1910+
return fmt.Errorf("SyncRepositoryHook: %v", err)
1911+
}
1912+
}
19121913
return nil
19131914
})
19141915
}

0 commit comments

Comments
 (0)