diff options
| author | wxiaoguang <wxiaoguang@gmail.com> | 2022-04-01 10:55:30 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-04-01 10:55:30 +0800 |
| commit | 124b072f0b69650baff086b9688d198f5a6761af (patch) | |
| tree | fa18f7930053a8408e124875b5dec20e0309332b /services/pull/patch_unmerged.go | |
| parent | 3a73645502392110369b5d78fa2c9136e77e4aa2 (diff) | |
| download | gitea-124b072f0b69650baff086b9688d198f5a6761af.tar.gz gitea-124b072f0b69650baff086b9688d198f5a6761af.zip | |
Remove `git.Command.Run` and `git.Command.RunInDir*` (#19280)
Follows #19266, #8553, Close #18553, now there are only three `Run..(&RunOpts{})` functions.
* before: `stdout, err := RunInDir(path)`
* now: `stdout, _, err := RunStdString(&git.RunOpts{Dir:path})`
Diffstat (limited to 'services/pull/patch_unmerged.go')
| -rw-r--r-- | services/pull/patch_unmerged.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go index abd54b07cf..3839419142 100644 --- a/services/pull/patch_unmerged.go +++ b/services/pull/patch_unmerged.go @@ -63,11 +63,10 @@ func readUnmergedLsFileLines(ctx context.Context, tmpBasePath string, outputChan stderr := &strings.Builder{} err = git.NewCommand(ctx, "ls-files", "-u", "-z"). - RunWithContext(&git.RunContext{ - Timeout: -1, - Dir: tmpBasePath, - Stdout: lsFilesWriter, - Stderr: stderr, + Run(&git.RunOpts{ + Dir: tmpBasePath, + Stdout: lsFilesWriter, + Stderr: stderr, PipelineFunc: func(_ context.Context, _ context.CancelFunc) error { _ = lsFilesWriter.Close() defer func() { |