summaryrefslogtreecommitdiff
path: root/repository.go
diff options
context:
space:
mode:
authorJesse Ezell <[email protected]>2014-02-28 00:21:48 -0800
committerJesse Ezell <[email protected]>2014-02-28 00:21:48 -0800
commit0497d2b1146c307923b0a372dde75ace8557fe66 (patch)
treed2c438deeb285eeff70b9a6a8a2f6271c435f896 /repository.go
parentfc6d0fbfff9988cf51d43d605dc1a909e8ca0aac (diff)
fix bad merge (LastError -> MakeGitError)
Diffstat (limited to 'repository.go')
-rw-r--r--repository.go12
1 files changed, 7 insertions, 5 deletions
diff --git a/repository.go b/repository.go
index bf6aee5..f6bfcb4 100644
--- a/repository.go
+++ b/repository.go
@@ -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