jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

Add branch iterator #66

Merged
jezell merged 9 commits from branch-iterator into master 2014-04-26 13:25:26 -05:00
Conversation 1 Commits 9 Files Changed 4 +2 -4
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a7d3c5955a - Show all commits

4
branch.go
View File

@ -53,9 +53,7 @@ func (i *BranchIterator) Next() (*Branch, BranchType, error) {
ecode := C.git_branch_next(&refPtr, &refType, i.ptr) ecode := C.git_branch_next(&refPtr, &refType, i.ptr)
if ecode == C.GIT_ITEROVER { if ecode < 0 {
return nil, BranchLocal, ErrIterOver
} else if ecode < 0 {
return nil, BranchLocal, MakeGitError(ecode) return nil, BranchLocal, MakeGitError(ecode)
} }

2
branch_test.go
View File

@ -20,7 +20,7 @@ func TestBranchIterator(t *testing.T) {
t.Fatalf("expected BranchLocal, not %v", t) t.Fatalf("expected BranchLocal, not %v", t)
} }
b, bt, err = i.Next() b, bt, err = i.Next()
if err != ErrIterOver { if !IsErrorCode(err, ErrIterOver) {
t.Fatal("expected iterover") t.Fatal("expected iterover")
} }
} }