diff options
| author | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-11-02 11:39:12 +0100 |
|---|---|---|
| committer | Kamil Trzcinski <ayufan@ayufan.eu> | 2016-11-02 11:39:12 +0100 |
| commit | a431ca0f8b7f8967e89a35caddf1e41e53eee290 (patch) | |
| tree | 61754705d6a313ccd372e6e83c282aa3c084f908 /app/services/commits/change_service.rb | |
| parent | b328c7885532ccff70e1f9f7dc970a8dde0c52d6 (diff) | |
| download | gitlab-ce-a431ca0f8b7f8967e89a35caddf1e41e53eee290.tar.gz | |
Don't execute git hooks if you create branch as part of other change
Currently, our procedure for adding a commit requires us to execute `CreateBranchService` before file creation.
It's OK, but also we do execute `git hooks` (the `PostReceive` sidekiq job) as part of this process.
However, this hook is execute before the file is actually committed, so the ref is updated.
Secondly, we do execute a `git hooks` after committing file and updating ref.
This results in duplicate `PostReceive` jobs, where the first one is completely invalid.
This change makes the branch creation, something that is intermediate step of bigger process (file creation or update, commit cherry pick or revert) to not execute git hooks.
Diffstat (limited to 'app/services/commits/change_service.rb')
| -rw-r--r-- | app/services/commits/change_service.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/services/commits/change_service.rb b/app/services/commits/change_service.rb index 1c82599c579..2d4c9788d02 100644 --- a/app/services/commits/change_service.rb +++ b/app/services/commits/change_service.rb @@ -55,7 +55,7 @@ module Commits return success if repository.find_branch(new_branch) result = CreateBranchService.new(@project, current_user) - .execute(new_branch, @target_branch, source_project: @source_project) + .execute(new_branch, @target_branch, source_project: @source_project, with_hooks: false) if result[:status] == :error raise ChangeError, "There was an error creating the source branch: #{result[:message]}" |