aboutsummaryrefslogtreecommitdiffstats
path: root/services/pull/patch_unmerged.go
diff options
context:
space:
mode:
authorTheFox0x7 <thefox0x7@gmail.com>2025-03-04 20:56:11 +0100
committerGitHub <noreply@github.com>2025-03-04 11:56:11 -0800
commitae3a18e01a10520f5e12255304c7a9bbb246c41e (patch)
tree58494c1e9ae3ac68e773efdcfcb98a961d56914a /services/pull/patch_unmerged.go
parent6c8fb8d455cfe25d5aa966674624bce99fba1735 (diff)
downloadgitea-ae3a18e01a10520f5e12255304c7a9bbb246c41e.tar.gz
gitea-ae3a18e01a10520f5e12255304c7a9bbb246c41e.zip
Remove context from git struct (#33793)
Argument is moved from struct init in command run, which lets us remove context from struct.
Diffstat (limited to 'services/pull/patch_unmerged.go')
-rw-r--r--services/pull/patch_unmerged.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/services/pull/patch_unmerged.go b/services/pull/patch_unmerged.go
index c60c48d923..200d2233e9 100644
--- a/services/pull/patch_unmerged.go
+++ b/services/pull/patch_unmerged.go
@@ -72,8 +72,8 @@ func readUnmergedLsFileLines(ctx context.Context, tmpBasePath string, outputChan
}()
stderr := &strings.Builder{}
- err = git.NewCommand(ctx, "ls-files", "-u", "-z").
- Run(&git.RunOpts{
+ err = git.NewCommand("ls-files", "-u", "-z").
+ Run(ctx, &git.RunOpts{
Dir: tmpBasePath,
Stdout: lsFilesWriter,
Stderr: stderr,