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

fix bad merge (LastError -> MakeGitError)

This commit is contained in:
Jesse Ezell 2014-02-28 00:21:48 -08:00
parent fc6d0fbfff
commit 0497d2b114
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
repository.go
View File

@ -352,8 +352,9 @@ func (v *Repository) EnsureLog(name string) error {
runtime.LockOSThread() runtime.LockOSThread()
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
if ret := C.git_reference_ensure_log(v.ptr, cname); ret < 0 { ret := C.git_reference_ensure_log(v.ptr, cname)
return LastError() if ret < 0 {
return MakeGitError(ret)
} }
return nil return nil
@ -370,7 +371,7 @@ func (v *Repository) HasLog(name string) (bool, error) {
ret := C.git_reference_has_log(v.ptr, cname) ret := C.git_reference_has_log(v.ptr, cname)
if ret < 0 { if ret < 0 {
return false, LastError() return false, MakeGitError(ret)
} }
return ret == 1, nil return ret == 1, nil
@ -385,8 +386,9 @@ func (v *Repository) DwimReference(name string) (*Reference, error) {
defer runtime.UnlockOSThread() defer runtime.UnlockOSThread()
var ptr *C.git_reference var ptr *C.git_reference
if ret := C.git_reference_dwim(&ptr, v.ptr, cname); ret < 0 { ret := C.git_reference_dwim(&ptr, v.ptr, cname)
return nil, LastError() if ret < 0 {
return nil, MakeGitError(ret)
} }
return newReferenceFromC(ptr), nil return newReferenceFromC(ptr), nil