diff options
| author | karthik nayak <knayak@gitlab.com> | 2022-10-05 11:13:47 +0300 |
|---|---|---|
| committer | karthik nayak <knayak@gitlab.com> | 2022-10-05 11:13:47 +0300 |
| commit | f955266a86bb86637389583c591ae79ed7ad460e (patch) | |
| tree | f052cb67a086587aa8a8967b72a3f3bae53691ad /cmd | |
| parent | 1d200302f736b50b48bf7e9ec7eb28f0e01dc559 (diff) | |
| parent | dcdb5cd3e1cc332ec067d8df7c1dae5d4958bf16 (diff) | |
Merge branch 'jc-spawn-git-in-pgid' into 'master'
command: Add option to spawn a command with a pgid
Closes #4493
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/4889
Merged-by: karthik nayak <knayak@gitlab.com>
Approved-by: Justin Tobler <jtobler@gitlab.com>
Co-authored-by: John Cai <jcai@gitlab.com>
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/gitaly/main.go | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cmd/gitaly/main.go b/cmd/gitaly/main.go index 805ac336a..62428a511 100644 --- a/cmd/gitaly/main.go +++ b/cmd/gitaly/main.go @@ -195,7 +195,10 @@ func run(cfg config.Cfg) error { } skipHooks, _ := env.GetBool("GITALY_TESTING_NO_GIT_HOOKS", false) - var commandFactoryOpts []git.ExecCommandFactoryOption + commandFactoryOpts := []git.ExecCommandFactoryOption{ + git.WithGitalyPid(os.Getpid()), + } + if skipHooks { commandFactoryOpts = append(commandFactoryOpts, git.WithSkipHooks()) } |