diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/helper_environment.go | 10 | ||||
| -rw-r--r-- | models/repo.go | 6 | ||||
| -rw-r--r-- | models/repo_generate.go | 2 | ||||
| -rw-r--r-- | models/update.go | 1 |
4 files changed, 15 insertions, 4 deletions
diff --git a/models/helper_environment.go b/models/helper_environment.go index 2095205db3..35af17adb1 100644 --- a/models/helper_environment.go +++ b/models/helper_environment.go @@ -10,6 +10,16 @@ import ( "strings" ) +// InternalPushingEnvironment returns an os environment to switch off hooks on push +// It is recommended to avoid using this unless you are pushing within a transaction +// or if you absolutely are sure that post-receive and pre-receive will do nothing +// We provide the full pushing-environment for other hook providers +func InternalPushingEnvironment(doer *User, repo *Repository) []string { + return append(PushingEnvironment(doer, repo), + EnvIsInternal+"=true", + ) +} + // PushingEnvironment returns an os environment to allow hooks to work on push func PushingEnvironment(doer *User, repo *Repository) []string { return FullPushingEnvironment(doer, doer, repo, repo.Name, 0) diff --git a/models/repo.go b/models/repo.go index 53a9196aa7..0dbdcc11b5 100644 --- a/models/repo.go +++ b/models/repo.go @@ -1012,7 +1012,7 @@ func createDelegateHooks(repoPath string) (err error) { } // initRepoCommit temporarily changes with work directory. -func initRepoCommit(tmpPath string, u *User) (err error) { +func initRepoCommit(tmpPath string, repo *Repository, u *User) (err error) { commitTimeStr := time.Now().Format(time.RFC3339) sig := u.NewGitSig() @@ -1061,7 +1061,7 @@ func initRepoCommit(tmpPath string, u *User) (err error) { if stdout, err := git.NewCommand("push", "origin", "master"). SetDescription(fmt.Sprintf("initRepoCommit (git push): %s", tmpPath)). - RunInDir(tmpPath); err != nil { + RunInDirWithEnv(tmpPath, InternalPushingEnvironment(u, repo)); err != nil { log.Error("Failed to push back to master: Stdout: %s\nError: %v", stdout, err) return fmt.Errorf("git push: %v", err) } @@ -1219,7 +1219,7 @@ func initRepository(e Engine, repoPath string, u *User, repo *Repository, opts C } // Apply changes and commit. - if err = initRepoCommit(tmpDir, u); err != nil { + if err = initRepoCommit(tmpDir, repo, u); err != nil { return fmt.Errorf("initRepoCommit: %v", err) } } diff --git a/models/repo_generate.go b/models/repo_generate.go index 98ef0ea000..556a5fc2f7 100644 --- a/models/repo_generate.go +++ b/models/repo_generate.go @@ -174,7 +174,7 @@ func generateRepoCommit(e Engine, repo, templateRepo, generateRepo *Repository, return fmt.Errorf("git remote add: %v", err) } - return initRepoCommit(tmpDir, repo.Owner) + return initRepoCommit(tmpDir, repo, repo.Owner) } // generateRepository initializes repository from template diff --git a/models/update.go b/models/update.go index b6c04bd515..212f22cfc1 100644 --- a/models/update.go +++ b/models/update.go @@ -24,6 +24,7 @@ const ( EnvPusherID = "GITEA_PUSHER_ID" EnvKeyID = "GITEA_KEY_ID" EnvIsDeployKey = "GITEA_IS_DEPLOY_KEY" + EnvIsInternal = "GITEA_INTERNAL_PUSH" ) // CommitToPushCommit transforms a git.Commit to PushCommit type. |