diff options
| author | zeripath <art27@cantab.net> | 2022-01-19 23:26:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-19 23:26:57 +0000 |
| commit | 5cb0c9aa0d7eed087055b1efca79628957207d36 (patch) | |
| tree | d117a514e1f17e5f6bfcda1be273f6a971112663 /modules/git/tree_nogogit.go | |
| parent | 4563148a61ba892e8f2bb66342f00a950bcd5315 (diff) | |
| download | gitea-5cb0c9aa0d7eed087055b1efca79628957207d36.tar.gz gitea-5cb0c9aa0d7eed087055b1efca79628957207d36.zip | |
Propagate context and ensure git commands run in request context (#17868)
This PR continues the work in #17125 by progressively ensuring that git
commands run within the request context.
This now means that the if there is a git repo already open in the context it will be used instead of reopening it.
Signed-off-by: Andrew Thornton <art27@cantab.net>
Diffstat (limited to 'modules/git/tree_nogogit.go')
| -rw-r--r-- | modules/git/tree_nogogit.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/git/tree_nogogit.go b/modules/git/tree_nogogit.go index cfa2291e8f..f71e02f742 100644 --- a/modules/git/tree_nogogit.go +++ b/modules/git/tree_nogogit.go @@ -81,7 +81,7 @@ func (t *Tree) ListEntries() (Entries, error) { } } - stdout, err := NewCommand("ls-tree", "-l", t.ID.String()).RunInDirBytes(t.repo.Path) + stdout, err := NewCommandContext(t.repo.Ctx, "ls-tree", "-l", t.ID.String()).RunInDirBytes(t.repo.Path) if err != nil { if strings.Contains(err.Error(), "fatal: Not a valid object name") || strings.Contains(err.Error(), "fatal: not a tree object") { return nil, ErrNotExist{ @@ -104,7 +104,7 @@ func (t *Tree) ListEntriesRecursive() (Entries, error) { if t.entriesRecursiveParsed { return t.entriesRecursive, nil } - stdout, err := NewCommand("ls-tree", "-t", "-l", "-r", t.ID.String()).RunInDirBytes(t.repo.Path) + stdout, err := NewCommandContext(t.repo.Ctx, "ls-tree", "-t", "-l", "-r", t.ID.String()).RunInDirBytes(t.repo.Path) if err != nil { return nil, err } |