From 6c2a0daafcd6c8f3f695c8b7a2c881d3abc276b1 Mon Sep 17 00:00:00 2001 From: Antonio Jesus Navarro Perez Date: Tue, 12 Feb 2019 15:57:50 +0100 Subject: Ignore missing references on log --all To mimic the actual standard git behavior, we must ignore references that are pointing to wrong/unexistent objects. Signed-off-by: Antonio Jesus Navarro Perez --- plumbing/object/commit_walker.go | 34 +++++++++++++++++++++++----------- 1 file changed, 23 insertions(+), 11 deletions(-) (limited to 'plumbing/object/commit_walker.go') diff --git a/plumbing/object/commit_walker.go b/plumbing/object/commit_walker.go index 8c76557..fabd0c9 100644 --- a/plumbing/object/commit_walker.go +++ b/plumbing/object/commit_walker.go @@ -197,26 +197,38 @@ func NewCommitAllIter(repoStorer storage.Storer, commitIterFunc func(*Commit) Co commitsPath := list.New() commitsLookup := make(map[plumbing.Hash]*list.Element) head, err := storer.ResolveReference(repoStorer, plumbing.HEAD) - if err != nil { + if err != nil && err != plumbing.ErrReferenceNotFound { return nil, err + } else if err != plumbing.ErrReferenceNotFound { + if err = addReference(repoStorer, commitIterFunc, head, commitsPath, commitsLookup); err != nil { + return nil, err + } } // add all references along with the HEAD - if err = addReference(repoStorer, commitIterFunc, head, commitsPath, commitsLookup); err != nil { - return nil, err - } refIter, err := repoStorer.IterReferences() if err != nil { return nil, err } defer refIter.Close() - err = refIter.ForEach( - func(ref *plumbing.Reference) error { - return addReference(repoStorer, commitIterFunc, ref, commitsPath, commitsLookup) - }, - ) - if err != nil { - return nil, err + + for { + ref, err := refIter.Next() + if err == io.EOF { + break + } + + if err == plumbing.ErrReferenceNotFound { + continue + } + + if err != nil { + return nil, err + } + + if err = addReference(repoStorer, commitIterFunc, ref, commitsPath, commitsLookup); err != nil { + return nil, err + } } return &commitAllIterator{commitsPath.Front()}, nil -- cgit From 2b248220113c6eb8699da4aebdb6665b9751f471 Mon Sep 17 00:00:00 2001 From: Antonio Jesus Navarro Perez Date: Wed, 13 Feb 2019 09:57:27 +0100 Subject: Improve error handling logic Signed-off-by: Antonio Jesus Navarro Perez --- plumbing/object/commit_walker.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'plumbing/object/commit_walker.go') diff --git a/plumbing/object/commit_walker.go b/plumbing/object/commit_walker.go index fabd0c9..0eff059 100644 --- a/plumbing/object/commit_walker.go +++ b/plumbing/object/commit_walker.go @@ -197,12 +197,12 @@ func NewCommitAllIter(repoStorer storage.Storer, commitIterFunc func(*Commit) Co commitsPath := list.New() commitsLookup := make(map[plumbing.Hash]*list.Element) head, err := storer.ResolveReference(repoStorer, plumbing.HEAD) + if err == nil { + err = addReference(repoStorer, commitIterFunc, head, commitsPath, commitsLookup) + } + if err != nil && err != plumbing.ErrReferenceNotFound { return nil, err - } else if err != plumbing.ErrReferenceNotFound { - if err = addReference(repoStorer, commitIterFunc, head, commitsPath, commitsLookup); err != nil { - return nil, err - } } // add all references along with the HEAD -- cgit