Skip to content

Commit b4306de

Browse files
committed
some fixes
1 parent c735959 commit b4306de

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

modules/git/tree_gogit.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
package git
88

99
import (
10+
"context"
1011
"io"
1112

1213
"github.com/go-git/go-git/v5/plumbing"
@@ -57,7 +58,7 @@ func (t *Tree) ListEntries() (Entries, error) {
5758
}
5859

5960
// ListEntriesRecursiveWithSize returns all entries of current tree recursively including all subtrees
60-
func (t *Tree) ListEntriesRecursiveWithSize() (Entries, error) {
61+
func (t *Tree) ListEntriesRecursiveWithSize(ctx context.Context) (Entries, error) {
6162
if t.gogitTree == nil {
6263
err := t.loadTreeObject()
6364
if err != nil {
@@ -93,6 +94,6 @@ func (t *Tree) ListEntriesRecursiveWithSize() (Entries, error) {
9394
}
9495

9596
// ListEntriesRecursiveFast is the alias of ListEntriesRecursiveWithSize for the gogit version
96-
func (t *Tree) ListEntriesRecursiveFast() (Entries, error) {
97-
return t.ListEntriesRecursiveWithSize()
97+
func (t *Tree) ListEntriesRecursiveFast(ctx context.Context) (Entries, error) {
98+
return t.ListEntriesRecursiveWithSize(ctx)
9899
}

modules/git/tree_nogogit.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,6 @@ func (t *Tree) listEntriesRecursive(ctx context.Context, extraArgs TrustedCmdArg
105105
t.entriesRecursive = append(t.entriesRecursive, entry)
106106
return nil
107107
}, extraArgs)
108-
if err == nil {
109-
t.entriesRecursiveParsed = true
110-
}
111108
return t.entriesRecursive, err
112109
}
113110

0 commit comments

Comments
 (0)