summaryrefslogtreecommitdiff
path: root/object.go
diff options
context:
space:
mode:
authorlhchavez <[email protected]>2019-01-08 02:51:21 +0000
committerlhchavez <[email protected]>2019-01-08 02:51:21 +0000
commit6d67bde74a667dcdd060ef519832e8fd81064a8e (patch)
tree705e564b9dedf0ceced47e6f01012cb9fcb6322f /object.go
parent35518c78df9ae727651212512bfaa1a8dae02585 (diff)
parent2609f4c6f25a7da56e2e4960c250ea3dfb53e82b (diff)
Merge remote-tracking branch 'upstream/master' into repository-create_commit_from_ids
Diffstat (limited to 'object.go')
-rw-r--r--object.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/object.go b/object.go
index 66a4618..40ab2bf 100644
--- a/object.go
+++ b/object.go
@@ -13,12 +13,12 @@ import (
type ObjectType int
const (
- ObjectAny ObjectType = C.GIT_OBJ_ANY
- ObjectBad ObjectType = C.GIT_OBJ_BAD
- ObjectCommit ObjectType = C.GIT_OBJ_COMMIT
- ObjectTree ObjectType = C.GIT_OBJ_TREE
- ObjectBlob ObjectType = C.GIT_OBJ_BLOB
- ObjectTag ObjectType = C.GIT_OBJ_TAG
+ ObjectAny ObjectType = C.GIT_OBJECT_ANY
+ ObjectBad ObjectType = C.GIT_OBJECT_BAD
+ ObjectCommit ObjectType = C.GIT_OBJECT_COMMIT
+ ObjectTree ObjectType = C.GIT_OBJECT_TREE
+ ObjectBlob ObjectType = C.GIT_OBJECT_BLOB
+ ObjectTag ObjectType = C.GIT_OBJECT_TAG
)
type Object struct {
@@ -217,7 +217,7 @@ func (o *Object) Peel(t ObjectType) (*Object, error) {
runtime.LockOSThread()
defer runtime.UnlockOSThread()
- err := C.git_object_peel(&cobj, o.ptr, C.git_otype(t))
+ err := C.git_object_peel(&cobj, o.ptr, C.git_object_t(t))
runtime.KeepAlive(o)
if err < 0 {
return nil, MakeGitError(err)