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

Merge functions (in progress) #63

Merged
jezell merged 17 commits from jezell/merge into master 2014-04-26 13:42:18 -05:00
Conversation 5 Commits 17 Files Changed 6 +7 -5
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0497d2b114 - Show all commits

12
repository.go
View File

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