summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlhchavez <[email protected]>2019-01-12 21:21:20 +0000
committerlhchavez <[email protected]>2019-02-11 03:57:50 +0000
commit5fda6dd90191b1c51a1785ad7cabd2fd5b05e802 (patch)
treee05523858ab07cb0df457dd3d55cf5303222445c
parent2f91268f7464b21051b4800975a04a1ecde3f559 (diff)
Uprev vendored libgit2 to v0.28
New version is here!
-rw-r--r--git_static.go4
-rw-r--r--object.go16
-rw-r--r--odb.go2
m---------vendor/libgit20
4 files changed, 11 insertions, 11 deletions
diff --git a/git_static.go b/git_static.go
index 547ae8a..d7c2295 100644
--- a/git_static.go
+++ b/git_static.go
@@ -8,8 +8,8 @@ package git
#cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc
#include <git2.h>
-#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 27
-# error "Invalid libgit2 version; this git2go supports libgit2 v0.27"
+#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 28
+# error "Invalid libgit2 version; this git2go supports libgit2 v0.28"
#endif
*/
diff --git a/object.go b/object.go
index 40ab2bf..2d75b06 100644
--- a/object.go
+++ b/object.go
@@ -13,12 +13,12 @@ import (
type ObjectType int
const (
- 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
+ ObjectAny ObjectType = C.GIT_OBJECT_ANY
+ ObjectInvalid ObjectType = C.GIT_OBJECT_INVALID
+ 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 {
@@ -35,8 +35,8 @@ func (t ObjectType) String() string {
switch t {
case ObjectAny:
return "Any"
- case ObjectBad:
- return "Bad"
+ case ObjectInvalid:
+ return "Invalid"
case ObjectCommit:
return "Commit"
case ObjectTree:
diff --git a/odb.go b/odb.go
index 5768cf4..fec0eb9 100644
--- a/odb.go
+++ b/odb.go
@@ -66,7 +66,7 @@ func (v *Odb) ReadHeader(oid *Oid) (uint64, ObjectType, error) {
ret := C.git_odb_read_header(&sz, &cotype, v.ptr, oid.toC())
runtime.KeepAlive(v)
if ret < 0 {
- return 0, ObjectBad, MakeGitError(ret)
+ return 0, ObjectInvalid, MakeGitError(ret)
}
return uint64(sz), ObjectType(cotype), nil
diff --git a/vendor/libgit2 b/vendor/libgit2
-Subproject fba70a9d5f1fa433968a3dfd51e3153c8eebe83
+Subproject 1a107fac0fc88a4d74b64ffc9ae2fd178ba631c