diff --git a/External/libgit2 b/External/libgit2 index 49e408b3..f28579db 160000 --- a/External/libgit2 +++ b/External/libgit2 @@ -1 +1 @@ -Subproject commit 49e408b3208bc3093757a1c2db938d3590f3f412 +Subproject commit f28579db11737eaa2ced18498e229967a12f1c3f diff --git a/ObjectiveGit/GTOID.m b/ObjectiveGit/GTOID.m index 23412df4..45d4741e 100644 --- a/ObjectiveGit/GTOID.m +++ b/ObjectiveGit/GTOID.m @@ -10,6 +10,7 @@ #import "NSError+Git.h" #import "git2/errors.h" +#import "git2/deprecated.h" #import "git2/odb.h" @interface GTOID () { diff --git a/ObjectiveGit/GTObject.h b/ObjectiveGit/GTObject.h index e562e8dc..e8762eb2 100644 --- a/ObjectiveGit/GTObject.h +++ b/ObjectiveGit/GTObject.h @@ -37,8 +37,9 @@ typedef NS_ENUM(int, GTObjectType) { GTObjectTypeTree = GIT_OBJECT_TREE, /**< A tree (directory listing) object. */ GTObjectTypeBlob = GIT_OBJECT_BLOB, /**< A file revision object. */ GTObjectTypeTag = GIT_OBJECT_TAG, /**< An annotated tag object. */ - GTObjectTypeOffsetDelta = GIT_OBJECT_OFS_DELTA,/**< A delta, base is given by an offset. */ - GTObjectTypeRefDelta = GIT_OBJECT_REF_DELTA, /**< A delta, base is given by object id. */ + // Pack-only types are no longer part of libgit2's public object enum. + GTObjectTypeOffsetDelta = 6, /**< A delta, base is given by an offset. */ + GTObjectTypeRefDelta = 7, /**< A delta, base is given by object id. */ }; @class GTRepository; diff --git a/ObjectiveGit/GTRepository.h b/ObjectiveGit/GTRepository.h index d1c4819c..18948e01 100644 --- a/ObjectiveGit/GTRepository.h +++ b/ObjectiveGit/GTRepository.h @@ -36,6 +36,7 @@ #import #import #import +#import #import #import #import diff --git a/script/update_libgit2 b/script/update_libgit2 index faf306e3..ddb9debe 100755 --- a/script/update_libgit2 +++ b/script/update_libgit2 @@ -69,6 +69,7 @@ cmake -DBUILD_SHARED_LIBS:BOOL=OFF \ -DBUILD_TESTS:BOOL=OFF \ -DTHREADSAFE:BOOL=ON \ -DUSE_SSH=libssh2 \ + -DUSE_GSSAPI:BOOL=OFF \ -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ .. cmake --build .