Skip to content

Commit bf1e8a4

Browse files
authored
Merge pull request libgit2#479 from lhchavez/uprev-libgit2
Uprev vendored libgit2 to v.0.28
2 parents 2f91268 + 5fda6dd commit bf1e8a4

File tree

4 files changed

+12
-12
lines changed

4 files changed

+12
-12
lines changed

git_static.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ package git
88
#cgo !windows pkg-config: --static ${SRCDIR}/static-build/install/lib/pkgconfig/libgit2.pc
99
#include <git2.h>
1010
11-
#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 27
12-
# error "Invalid libgit2 version; this git2go supports libgit2 v0.27"
11+
#if LIBGIT2_VER_MAJOR != 0 || LIBGIT2_VER_MINOR != 28
12+
# error "Invalid libgit2 version; this git2go supports libgit2 v0.28"
1313
#endif
1414
1515
*/

object.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import (
1313
type ObjectType int
1414

1515
const (
16-
ObjectAny ObjectType = C.GIT_OBJECT_ANY
17-
ObjectBad ObjectType = C.GIT_OBJECT_BAD
18-
ObjectCommit ObjectType = C.GIT_OBJECT_COMMIT
19-
ObjectTree ObjectType = C.GIT_OBJECT_TREE
20-
ObjectBlob ObjectType = C.GIT_OBJECT_BLOB
21-
ObjectTag ObjectType = C.GIT_OBJECT_TAG
16+
ObjectAny ObjectType = C.GIT_OBJECT_ANY
17+
ObjectInvalid ObjectType = C.GIT_OBJECT_INVALID
18+
ObjectCommit ObjectType = C.GIT_OBJECT_COMMIT
19+
ObjectTree ObjectType = C.GIT_OBJECT_TREE
20+
ObjectBlob ObjectType = C.GIT_OBJECT_BLOB
21+
ObjectTag ObjectType = C.GIT_OBJECT_TAG
2222
)
2323

2424
type Object struct {
@@ -35,8 +35,8 @@ func (t ObjectType) String() string {
3535
switch t {
3636
case ObjectAny:
3737
return "Any"
38-
case ObjectBad:
39-
return "Bad"
38+
case ObjectInvalid:
39+
return "Invalid"
4040
case ObjectCommit:
4141
return "Commit"
4242
case ObjectTree:

odb.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ func (v *Odb) ReadHeader(oid *Oid) (uint64, ObjectType, error) {
6666
ret := C.git_odb_read_header(&sz, &cotype, v.ptr, oid.toC())
6767
runtime.KeepAlive(v)
6868
if ret < 0 {
69-
return 0, ObjectBad, MakeGitError(ret)
69+
return 0, ObjectInvalid, MakeGitError(ret)
7070
}
7171

7272
return uint64(sz), ObjectType(cotype), nil

vendor/libgit2

Submodule libgit2 updated 2450 files

0 commit comments

Comments
 (0)