Revert "Import more focused libgit2 headers where possible"

jspahrsummers · jspahrsummers · commit 9b9af54aad18 · 2014-11-07T10:13:44.000-08:00
This reverts commit 2c0885e.
diff --git a/ObjectiveGit/Categories/NSArray+StringArray.h b/ObjectiveGit/Categories/NSArray+StringArray.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/strarray.h"
+
+#import "git2.h"
 
 @interface NSArray (StringArray)
 
diff --git a/ObjectiveGit/Categories/NSData+Git.h b/ObjectiveGit/Categories/NSData+Git.h
@@ -3,7 +3,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/buffer.h"
+#import "git2.h"
 
 @interface NSData (Git)
 
diff --git a/ObjectiveGit/Categories/NSDate+GTTimeAdditions.h b/ObjectiveGit/Categories/NSDate+GTTimeAdditions.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+
+#import "git2.h"
 
 @interface NSDate (GTTimeAdditions)
 
diff --git a/ObjectiveGit/Categories/NSError+Git.m b/ObjectiveGit/Categories/NSError+Git.m
@@ -28,7 +28,7 @@
 //
 
 #import "NSError+Git.h"
-#import "git2/errors.h"
+#import "git2.h"
 
 NSString * const GTGitErrorDomain = @"GTGitErrorDomain";
 
diff --git a/ObjectiveGit/Categories/NSString+Git.h b/ObjectiveGit/Categories/NSString+Git.h
@@ -28,6 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "git2.h"
 
 @interface NSString (Git)
 
diff --git a/ObjectiveGit/GTBlame.h b/ObjectiveGit/GTBlame.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/blame.h"
+#import "git2.h"
 
 @class GTBlameHunk;
 @class GTRepository;
diff --git a/ObjectiveGit/GTBlameHunk.h b/ObjectiveGit/GTBlameHunk.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/blame.h"
+#import "git2.h"
 
 @class GTOID;
 @class GTSignature;
diff --git a/ObjectiveGit/GTConfiguration.h b/ObjectiveGit/GTConfiguration.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import "git2.h"
 
 @class GTRepository;
 @class GTSignature;
diff --git a/ObjectiveGit/GTCredential.h b/ObjectiveGit/GTCredential.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/transport.h"
+#import "git2.h"
 
 /// An enum describing the data needed for authentication.
 /// See `git_credtype_t`.
diff --git a/ObjectiveGit/GTDiff.h b/ObjectiveGit/GTDiff.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import "git2.h"
 #import "GTDiffDelta.h"
 
 @class GTDiffDelta;
diff --git a/ObjectiveGit/GTDiffDelta.h b/ObjectiveGit/GTDiffDelta.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import "git2.h"
 #import "GTDiffFile.h"
 
 @class GTBlob;
diff --git a/ObjectiveGit/GTDiffFile.h b/ObjectiveGit/GTDiffFile.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import "git2.h"
 
 /// Flags which may be set on the file.
 ///
diff --git a/ObjectiveGit/GTDiffHunk.h b/ObjectiveGit/GTDiffHunk.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "git2.h"
 
 @class GTDiffLine;
 @class GTDiffPatch;
diff --git a/ObjectiveGit/GTDiffHunk.m b/ObjectiveGit/GTDiffHunk.m
@@ -11,7 +11,6 @@
 #import "GTDiffLine.h"
 #import "GTDiffPatch.h"
 #import "NSError+Git.h"
-#import "git2/patch.h"
 
 @interface GTDiffHunk ()
 
diff --git a/ObjectiveGit/GTDiffLine.h b/ObjectiveGit/GTDiffLine.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+#import "git2.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.h"
 
 @class GTDiffHunk;
 @class GTDiffDelta;
diff --git a/ObjectiveGit/GTFilter.h b/ObjectiveGit/GTFilter.h
@@ -7,6 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "git2.h"
+#import "git2/sys/filter.h"
 
 @class GTRepository;
 @class GTFilterSource;
diff --git a/ObjectiveGit/GTFilterList.h b/ObjectiveGit/GTFilterList.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/filter.h"
+#import "git2.h"
 
 @class GTBlob;
 @class GTRepository;
diff --git a/ObjectiveGit/GTFilterSource.h b/ObjectiveGit/GTFilterSource.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "git2.h"
 #import "git2/sys/filter.h"
 
 @class GTOID;
diff --git a/ObjectiveGit/GTIndex.h b/ObjectiveGit/GTIndex.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#include "git2/types.h"
+#include "git2.h"
 
 @class GTIndexEntry;
 @class GTRepository;
diff --git a/ObjectiveGit/GTIndexEntry.h b/ObjectiveGit/GTIndexEntry.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#include "git2/index.h"
+#include "git2.h"
 
 typedef NS_ENUM(NSInteger, GTIndexEntryStatus) {
 	GTIndexEntryStatusUpdated = 0,
diff --git a/ObjectiveGit/GTOID.h b/ObjectiveGit/GTOID.h
@@ -6,8 +6,7 @@
 //  Copyright (c) 2013 GitHub, Inc. All rights reserved.
 //
 
-#import <Foundation/Foundation.h>
-#import "git2/oid.h"
+#import "git2.h"
 #import "GTObject.h"
 
 /// Represents an object ID.
diff --git a/ObjectiveGit/GTObject.h b/ObjectiveGit/GTObject.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import "git2.h"
 
 typedef NS_ENUM(int, GTObjectType) {
 	GTObjectTypeAny = GIT_OBJ_ANY,				/**< Object can be any of the following */
diff --git a/ObjectiveGit/GTReflog.h b/ObjectiveGit/GTReflog.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "git2.h"
 
 @class GTSignature;
 @class GTReflogEntry;
diff --git a/ObjectiveGit/GTReflogEntry.h b/ObjectiveGit/GTReflogEntry.h
@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "git2.h"
 
 @class GTOID;
 @class GTSignature;
diff --git a/ObjectiveGit/GTRemote.h b/ObjectiveGit/GTRemote.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/remote.h"
+#import "git2.h"
 
 @class GTRepository;
 @class GTOID;
diff --git a/ObjectiveGit/GTRepository+Blame.m b/ObjectiveGit/GTRepository+Blame.m
@@ -8,7 +8,7 @@
 
 #import "GTRepository+Blame.h"
 
-#import "git2/blame.h"
+#import "git2.h"
 #import "GTBlame.h"
 #import "NSError+Git.h"
 
diff --git a/ObjectiveGit/GTStatusDelta.h b/ObjectiveGit/GTStatusDelta.h
@@ -7,7 +7,8 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/diff.h"
+
+#import "git2.h"
 
 @class GTDiffFile;
 
diff --git a/ObjectiveGit/GTTreeBuilder.h b/ObjectiveGit/GTTreeBuilder.h
@@ -28,7 +28,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import "git2/types.h"
+#import "git2.h"
 
 /// The mode of an index or tree entry.
 typedef NS_ENUM(NSInteger, GTFileMode) {
diff --git a/ObjectiveGit/ObjectiveGit.m b/ObjectiveGit/ObjectiveGit.m
@@ -6,7 +6,7 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
-#import "git2/threads.h"
+#import "git2.h"
 
 __attribute__((constructor))
 static void GTSetupThreads(void) {
