gitx · hannesa2 · Feb 8, 2019 · Feb 9, 2022 · Sep 14, 2026 · Sep 14, 2026
diff --git a/External/libgit2 b/External/libgit2
diff --git a/ObjectiveGit/Categories/NSArray+StringArray.h b/ObjectiveGit/Categories/NSArray+StringArray.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/strarray.h"
+#import <git2/strarray.h>
 
 @interface NSArray (StringArray)
 

diff --git a/ObjectiveGit/Categories/NSData+Git.h b/ObjectiveGit/Categories/NSData+Git.h
@@ -3,8 +3,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/buffer.h"
-#import "git2/oid.h"
+#import <git2/buffer.h>
+#import <git2/oid.h>
 
 @interface NSData (Git)
 

diff --git a/ObjectiveGit/Categories/NSData+Git.m b/ObjectiveGit/Categories/NSData+Git.m
@@ -6,6 +6,7 @@
 #import "NSError+Git.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 @implementation NSData (Git)
 

diff --git a/ObjectiveGit/Categories/NSDate+GTTimeAdditions.h b/ObjectiveGit/Categories/NSDate+GTTimeAdditions.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import <git2/types.h>
 
 @interface NSDate (GTTimeAdditions)
 

diff --git a/ObjectiveGit/GTBlame.h b/ObjectiveGit/GTBlame.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/blame.h"
+#import <git2/types.h>
+#import <git2/blame.h>
 
 @class GTBlameHunk;
 @class GTRepository;

diff --git a/ObjectiveGit/GTBlameHunk.h b/ObjectiveGit/GTBlameHunk.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/blame.h"
+#import <git2/types.h>
+#import <git2/blame.h>
 
 @class GTOID;
 @class GTSignature;

diff --git a/ObjectiveGit/GTBlob.m b/ObjectiveGit/GTBlob.m
@@ -36,6 +36,7 @@
 
 #import "git2/blob.h"
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 @implementation GTBlob
 

diff --git a/ObjectiveGit/GTBranch.m b/ObjectiveGit/GTBranch.m
@@ -37,6 +37,7 @@
 #import "git2/branch.h"
 #import "git2/errors.h"
 #import "git2/graph.h"
+#import "git2/deprecated.h"
 
 @implementation GTBranch
 

diff --git a/ObjectiveGit/GTCheckoutOptions.h b/ObjectiveGit/GTCheckoutOptions.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/checkout.h"
+#import <git2/checkout.h>
 
 @class GTDiffFile;
 

diff --git a/ObjectiveGit/GTConfiguration.h b/ObjectiveGit/GTConfiguration.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import <git2/types.h>
 
 @class GTRemote;
 @class GTRepository;

diff --git a/ObjectiveGit/GTConfiguration.m b/ObjectiveGit/GTConfiguration.m
@@ -17,6 +17,7 @@
 #import "git2/config.h"
 #import "git2/errors.h"
 #import "git2/buffer.h"
+#import "git2/deprecated.h"
 
 @interface GTConfiguration ()
 @property (nonatomic, readonly, assign) git_config *git_config;

diff --git a/ObjectiveGit/GTCredential+Private.h b/ObjectiveGit/GTCredential+Private.h
@@ -27,4 +27,4 @@ typedef struct {
 	__unsafe_unretained GTCredentialProvider *credProvider;
 } GTCredentialAcquireCallbackInfo;
 
-int GTCredentialAcquireCallback(git_cred **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload);
+int GTCredentialAcquireCallback(git_credential **cred, const char *url, const char *username_from_url, unsigned int allowed_types, void *payload);
diff --git a/ObjectiveGit/GTCredential.h b/ObjectiveGit/GTCredential.h
@@ -7,14 +7,14 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/transport.h"
+#import <git2/transport.h>
 
 /// An enum describing the data needed for authentication.
-/// See `git_credtype_t`.
+/// See `git_credential_t`.
 typedef NS_ENUM(NSInteger, GTCredentialType) {
-    GTCredentialTypeUserPassPlaintext = GIT_CREDTYPE_USERPASS_PLAINTEXT,
-    GTCredentialTypeSSHKey = GIT_CREDTYPE_SSH_KEY,
-    GTCredentialTypeSSHCustom = GIT_CREDTYPE_SSH_CUSTOM,
+    GTCredentialTypeUserPassPlaintext = GIT_CREDENTIAL_USERPASS_PLAINTEXT,
+    GTCredentialTypeSSHKey = GIT_CREDENTIAL_SSH_KEY,
+    GTCredentialTypeSSHCustom = GIT_CREDENTIAL_SSH_CUSTOM,
 };
 
 NS_ASSUME_NONNULL_BEGIN
@@ -50,7 +50,7 @@ NS_ASSUME_NONNULL_BEGIN
 @end
 
 /// The GTCredential class is used to provide authentication data.
-/// It acts as a wrapper around `git_cred` objects.
+/// It acts as a wrapper around `git_credential` objects.
 @interface GTCredential : NSObject
 
 /// Create a credential object from a username/password pair.
@@ -86,8 +86,8 @@ NS_ASSUME_NONNULL_BEGIN
 /// Return a new GTCredential instance, or nil if an error occurred
 + (instancetype _Nullable)credentialWithUserName:(NSString *)userName publicKeyString:(NSString * _Nullable)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString * _Nullable)passphrase error:(NSError **)error;
 
-/// The underlying `git_cred` object.
-- (git_cred *)git_cred __attribute__((objc_returns_inner_pointer));
+/// The underlying `git_credential` object.
+- (git_credential *)git_credential __attribute__((objc_returns_inner_pointer));
 
 @end
 

diff --git a/ObjectiveGit/GTCredential.m b/ObjectiveGit/GTCredential.m
@@ -11,6 +11,8 @@
 #import "NSError+Git.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
+#import "git2/sys/errors.h"
 
 typedef GTCredential *(^GTCredentialProviderBlock)(GTCredentialType allowedTypes, NSString *URL, NSString *userName);
 

diff --git a/ObjectiveGit/GTDiff.h b/ObjectiveGit/GTDiff.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import <git2/diff.h>
 #import "GTDiffDelta.h"
 
 @class GTDiffDelta;

diff --git a/ObjectiveGit/GTDiff.m b/ObjectiveGit/GTDiff.m
@@ -18,6 +18,7 @@
 #import "EXTScope.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 NSString *const GTDiffOptionsFlagsKey = @"GTDiffOptionsFlagsKey";
 NSString *const GTDiffOptionsContextLinesKey = @"GTDiffOptionsContextLinesKey";

diff --git a/ObjectiveGit/GTDiffDelta.h b/ObjectiveGit/GTDiffDelta.h
@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
-#import "GTDiffFile.h"
+#import <git2/diff.h>
+#import <ObjectiveGit/GTDiffFile.h>
 
 @class GTBlob;
 @class GTDiff;

diff --git a/ObjectiveGit/GTDiffFile.h b/ObjectiveGit/GTDiffFile.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import <git2/diff.h>
 
 /// Flags which may be set on the file.
 ///

diff --git a/ObjectiveGit/GTDiffLine.h b/ObjectiveGit/GTDiffLine.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import <git2/diff.h>
 
 /// A character representing the origin of a given line.
 ///

diff --git a/ObjectiveGit/GTDiffPatch.h b/ObjectiveGit/GTDiffPatch.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/patch.h"
+#import <git2/patch.h>
 
 @class GTDiffHunk;
 @class GTDiffDelta;

diff --git a/ObjectiveGit/GTDiffPatch.m b/ObjectiveGit/GTDiffPatch.m
@@ -9,6 +9,7 @@
 #import "GTDiffPatch.h"
 
 #import "GTDiffHunk.h"
+#import "git2/deprecated.h"
 
 @interface GTDiffPatch ()
 

diff --git a/ObjectiveGit/GTEnumerator.h b/ObjectiveGit/GTEnumerator.h
@@ -29,7 +29,7 @@
 
 #import <Foundation/Foundation.h>
 #import "GTObject.h"
-#import "git2/revwalk.h"
+#import <git2/revwalk.h>
 
 /// Options to specify enumeration order when enumerating through a repository.
 /// With the exception of GTEnumeratorOptionsNone, the values here can be ORed

diff --git a/ObjectiveGit/GTFilter.m b/ObjectiveGit/GTFilter.m
@@ -13,6 +13,7 @@
 
 #import "git2/errors.h"
 #import "git2/sys/filter.h"
+#import "git2/deprecated.h"
 
 NSString * const GTFilterErrorDomain = @"GTFilterErrorDomain";
 

diff --git a/ObjectiveGit/GTFilterList.h b/ObjectiveGit/GTFilterList.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/filter.h"
+#import <git2/filter.h>
 
 @class GTBlob;
 @class GTRepository;

diff --git a/ObjectiveGit/GTFilterList.m b/ObjectiveGit/GTFilterList.m
@@ -14,6 +14,7 @@
 #import "NSError+Git.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 @interface GTFilterList ()
 

diff --git a/ObjectiveGit/GTFilterSource.h b/ObjectiveGit/GTFilterSource.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/sys/filter.h"
+#import <git2/sys/filter.h>
 
 @class GTOID;
 @class GTRepository;

diff --git a/ObjectiveGit/GTIndex.h b/ObjectiveGit/GTIndex.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#include "git2/types.h"
+#include <git2/types.h>
 
 @class GTIndexEntry;
 @class GTRepository;

diff --git a/ObjectiveGit/GTIndex.m b/ObjectiveGit/GTIndex.m
@@ -41,6 +41,7 @@
 #import "NSError+Git.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 // The block synonymous with libgit2's `git_index_matched_path_cb` callback.
 typedef BOOL (^GTIndexPathspecMatchedBlock)(NSString *matchedPathspec, NSString *path, BOOL *stop);

diff --git a/ObjectiveGit/GTIndexEntry.h b/ObjectiveGit/GTIndexEntry.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#include "git2/index.h"
+#include <git2/index.h>
 #import "GTObject.h"
 
 @class GTIndex;

diff --git a/ObjectiveGit/GTNote.h b/ObjectiveGit/GTNote.h
@@ -28,7 +28,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/oid.h"
+#import <git2/types.h>
+#import <git2/oid.h>
 
 @class GTSignature;
 @class GTRepository;

diff --git a/ObjectiveGit/GTOID.h b/ObjectiveGit/GTOID.h
@@ -7,8 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/oid.h"
-#import "GTObject.h"
+#import <git2/oid.h>
+#import <ObjectiveGit/GTObject.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ObjectiveGit/GTOID.m b/ObjectiveGit/GTOID.m
@@ -11,6 +11,7 @@
 
 #import "git2/errors.h"
 #import "git2/odb.h"
+#import "git2/deprecated.h"
 
 @interface GTOID () {
 	git_oid _git_oid;
@@ -98,7 +99,7 @@ + (instancetype)oidWithSHACString:(const char *)SHA {
 }
 
 - (BOOL)isZero {
-	return git_oid_iszero(self.git_oid) != 0;
+	return git_oid_is_zero(self.git_oid) != 0;
 }
 
 #pragma mark NSObject

diff --git a/ObjectiveGit/GTObject.h b/ObjectiveGit/GTObject.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import <git2/types.h>
 
 typedef NS_ENUM(int, GTObjectType) {
 	GTObjectTypeAny = GIT_OBJECT_ANY,				/**< Object can be any of the following */

diff --git a/ObjectiveGit/GTReference.h b/ObjectiveGit/GTReference.h
@@ -24,7 +24,7 @@
 //
 
 #import "GTObject.h"
-#import "git2/oid.h"
+#import <git2/oid.h>
 
 @class GTOID;
 @class GTReflog;

diff --git a/ObjectiveGit/GTReference.m b/ObjectiveGit/GTReference.m
@@ -35,6 +35,7 @@
 #import "GTRepository+References.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 @interface GTReference ()
 @property (nonatomic, readonly, assign) git_reference *git_reference;

diff --git a/ObjectiveGit/GTReflogEntry+Private.h b/ObjectiveGit/GTReflogEntry+Private.h
@@ -7,7 +7,7 @@
 //
 
 #import "GTReflogEntry.h"
-#import "git2/types.h"
+#import <git2/types.h>
 
 NS_ASSUME_NONNULL_BEGIN
 

diff --git a/ObjectiveGit/GTRemote.h b/ObjectiveGit/GTRemote.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/remote.h"
+#import <git2/remote.h>
 
 @class GTRepository;
 @class GTOID;

diff --git a/ObjectiveGit/GTRemote.m b/ObjectiveGit/GTRemote.m
@@ -17,6 +17,7 @@
 #import "EXTScope.h"
 
 #import "git2/errors.h"
+#import "git2/deprecated.h"
 
 NSString * const GTRemoteRenameProblematicRefSpecs = @"GTRemoteRenameProblematicRefSpecs";
 

diff --git a/ObjectiveGit/GTRepository+Blame.h b/ObjectiveGit/GTRepository+Blame.h
@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "GTRepository.h"
 
-#import "git2/blame.h"
+#import <git2/blame.h>
 
 @class GTBlame;
 

diff --git a/ObjectiveGit/GTRepository+Merging.h b/ObjectiveGit/GTRepository+Merging.h
@@ -8,7 +8,7 @@
 
 #import "GTRepository.h"
 #import "GTIndexEntry.h"
-#import "git2/merge.h"
+#import <git2/merge.h>
 
 NS_ASSUME_NONNULL_BEGIN