diff options
| author | Martin Scholz <martin.scholz83@outlook.com> | 2022-02-11 13:47:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-11 13:47:22 +0100 |
| commit | 26718a785ac49f17eab51ad0f5324d036b810f73 (patch) | |
| tree | 9c8371e01460dacf8e65c88b3526e2123525c717 /modules/git/repo.go | |
| parent | 393ea86ae192325e45d7fac0fc6a277da8fb0fca (diff) | |
| download | gitea-26718a785ac49f17eab51ad0f5324d036b810f73.tar.gz gitea-26718a785ac49f17eab51ad0f5324d036b810f73.zip | |
Change git.cmd to RunWithContext (#18693)
Change all `cmd...Pipeline` commands to `cmd.RunWithContext`.
#18553
Co-authored-by: Martin Scholz <martin.scholz@versasec.com>
Diffstat (limited to 'modules/git/repo.go')
| -rw-r--r-- | modules/git/repo.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/modules/git/repo.go b/modules/git/repo.go index ff704138a7..79a540209c 100644 --- a/modules/git/repo.go +++ b/modules/git/repo.go @@ -204,7 +204,13 @@ func Push(ctx context.Context, repoPath string, opts PushOptions) error { opts.Timeout = -1 } - err := cmd.RunInDirTimeoutEnvPipeline(opts.Env, opts.Timeout, repoPath, &outbuf, &errbuf) + err := cmd.RunWithContext(&RunContext{ + Env: opts.Env, + Timeout: opts.Timeout, + Dir: repoPath, + Stdout: &outbuf, + Stderr: &errbuf, + }) if err != nil { if strings.Contains(errbuf.String(), "non-fast-forward") { return &ErrPushOutOfDate{ |