Xcode 6.1 support

.gitmodules

@@ -1,12 +1,6 @@
 [submodule "libgit2"]
 	path = External/libgit2
 	url = https://github.com/libgit2/libgit2.git
-[submodule "ObjectiveGitTests/specta"]
-	path = ObjectiveGitTests/specta
-	url = https://github.com/specta/specta.git
-[submodule "ObjectiveGitTests/expecta"]
-	path = ObjectiveGitTests/expecta
-	url = https://github.com/specta/expecta.git
 [submodule "Configuration"]
 	path = External/Configuration
 	url = https://github.com/jspahrsummers/xcconfigs.git
@@ -16,3 +10,6 @@
 [submodule "libssh2"]
 	path = External/libssh2
 	url = git://git.libssh2.org/libssh2.git
+[submodule "External/Quick"]
+	path = External/Quick
+	url = https://github.com/github/Quick.git

Info.plist

@@ -3,25 +3,23 @@
 <plist version="1.0">
 <dict>
 	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
+	<string>en</string>
 	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string></string>
+	<string>$(EXECUTABLE_NAME)</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.github.${PRODUCT_NAME:rfc1034Identifier}</string>
+	<string>org.libgit2.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
+	<string>$(PRODUCT_NAME)</string>
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1</string>
+	<string>1.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

Classes/Categories/NSData+Git.h → ObjectiveGit/Categories/NSData+Git.h

@@ -2,6 +2,7 @@
 //  NSData+Git.h
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 
 @interface NSData (Git)

Classes/Categories/NSError+Git.h → ObjectiveGit/Categories/NSError+Git.h

@@ -27,6 +27,8 @@
 //  THE SOFTWARE.
 //
 
+#import <Foundation/Foundation.h>
+
 extern NSString * const GTGitErrorDomain;
 
 @interface NSError (Git)

Classes/Categories/NSError+Git.m → ObjectiveGit/Categories/NSError+Git.m

@@ -28,7 +28,7 @@
 //
 
 #import "NSError+Git.h"
-#include "git2.h"
+#import "git2.h"
 
 NSString * const GTGitErrorDomain = @"GTGitErrorDomain";
 

Classes/Categories/NSString+Git.h → ObjectiveGit/Categories/NSString+Git.h

@@ -27,7 +27,8 @@
 //  THE SOFTWARE.
 //
 
-#include "git2.h"
+#import <Foundation/Foundation.h>
+#import "git2.h"
 
 @interface NSString (Git)
 

Classes/GTCommit.m → ObjectiveGit/GTCommit.m

@@ -101,7 +101,7 @@ - (GTTree *)tree {
 	int gitError = git_commit_tree(&tree, self.git_commit);
 	if (gitError < GIT_OK) {
 		// todo: might want to return this error (and change method signature)
-		GTLog("Failed to get tree with error code: %d", gitError);
+		NSLog(@"Failed to get tree with error code: %d", gitError);
 		return nil;
 	}
 

Classes/GTConfiguration.h → ObjectiveGit/GTConfiguration.h

@@ -6,7 +6,8 @@
 //  Copyright (c) 2011 GitHub, Inc. All rights reserved.
 //
 
-#include "git2.h"
+#import <Foundation/Foundation.h>
+#import "git2.h"
 
 @class GTRepository;
 @class GTSignature;

Classes/GTCredential.h → ObjectiveGit/GTCredential.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2013 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 
 /// An enum describing the data needed for authentication.

Classes/GTCredential.m → ObjectiveGit/GTCredential.m

@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 GitHub, Inc. All rights reserved.
 //
 
-#import <ObjectiveGit/NSError+Git.h>
 #import "GTCredential.h"
 #import "GTCredential+Private.h"
+#import "NSError+Git.h"
 
 typedef GTCredential *(^GTCredentialProviderBlock)(GTCredentialType allowedTypes, NSString *URL, NSString *userName);
 

Classes/GTDiff.h → ObjectiveGit/GTDiff.h

@@ -6,8 +6,8 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
-
 #import "GTDiffDelta.h"
 
 @class GTDiffDelta;

Classes/GTDiffDelta.h → ObjectiveGit/GTDiffDelta.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 #import "GTDiffFile.h"
 

Classes/GTDiffFile.h → ObjectiveGit/GTDiffFile.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 
 /// Flags which may be set on the file.

Classes/GTDiffHunk.h → ObjectiveGit/GTDiffHunk.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 
 @class GTDiffLine;

Classes/GTDiffLine.h → ObjectiveGit/GTDiffLine.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 
 /// A character representing the origin of a given line.

Classes/GTDiffPatch.h → ObjectiveGit/GTDiffPatch.h

@@ -6,6 +6,7 @@
 //  Copyright (c) 2014 GitHub, Inc. All rights reserved.
 //
 
+#import <Foundation/Foundation.h>
 #import "git2.h"
 
 @class GTDiffHunk;

Classes/GTEnumerator.h → ObjectiveGit/GTEnumerator.h

@@ -27,6 +27,7 @@
 //  THE SOFTWARE.
 //
 
+#import <Foundation/Foundation.h>
 #import "GTObject.h"
 
 /// Options to specify enumeration order when enumerating through a repository.

Classes/GTIndex.h → ObjectiveGit/GTIndex.h

@@ -27,6 +27,7 @@
 //  THE SOFTWARE.
 //
 
+#import <Foundation/Foundation.h>
 #include "git2.h"
 
 @class GTIndexEntry;

Classes/GTIndex.m → ObjectiveGit/GTIndex.m

@@ -28,14 +28,16 @@
 //
 
 #import "GTIndex.h"
-#import "GTIndexEntry.h"
-#import "NSError+Git.h"
-#import "GTRepository.h"
-#import "GTRepository+Private.h"
+
+#import "EXTScope.h"
 #import "GTConfiguration.h"
+#import "GTIndexEntry.h"
 #import "GTOID.h"
+#import "GTRepository+Private.h"
+#import "GTRepository.h"
 #import "GTTree.h"
-#import "EXTScope.h"
+#import "NSArray+StringArray.h"
+#import "NSError+Git.h"
 
 // The block synonymous with libgit2's `git_index_matched_path_cb` callback.
 typedef BOOL (^GTIndexPathspecMatchedBlock)(NSString *matchedPathspec, NSString *path, BOOL *stop);
@@ -196,7 +198,7 @@ - (BOOL)removeFile:(NSString *)file error:(NSError **)error {
 		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to remove file %@ from index.", file];
 		return NO;
 	}
-	
+
 	return YES;
 }
 
@@ -212,7 +214,7 @@ - (BOOL)write:(NSError **)error {
 
 - (GTTree *)writeTree:(NSError **)error {
 	git_oid oid;
-  
+
 	int status = git_index_write_tree(&oid, self.git_index);
 	if (status != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to write index."];
@@ -225,13 +227,13 @@ - (GTTree *)writeTree:(NSError **)error {
 - (GTTree *)writeTreeToRepository:(GTRepository *)repository error:(NSError **)error {
 	NSParameterAssert(repository != nil);
 	git_oid oid;
-	
+
 	int status = git_index_write_tree_to(&oid, self.git_index, repository.git_repository);
 	if (status != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to write index to repository %@", repository];
 		return NULL;
 	}
-	
+
 	return [repository lookUpObjectByGitOid:&oid objectType:GTObjectTypeTree error:NULL];
 }
 
@@ -253,31 +255,31 @@ - (BOOL)hasConflicts {
 - (BOOL)enumerateConflictedFilesWithError:(NSError **)error usingBlock:(void (^)(GTIndexEntry *ancestor, GTIndexEntry *ours, GTIndexEntry *theirs, BOOL *stop))block {
 	NSParameterAssert(block != nil);
 	if (!self.hasConflicts) return YES;
-	
+
 	git_index_conflict_iterator *iterator = NULL;
 	int returnCode = git_index_conflict_iterator_new(&iterator, self.git_index);
 	if (returnCode != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:returnCode description:NSLocalizedString(@"Could not create git index iterator.", nil)];
 		return NO;
 	}
-	
+
 	@onExit {
 		if (iterator != NULL) git_index_conflict_iterator_free(iterator);
 	};
-	
+
 	while (YES) {
 		const git_index_entry *ancestor = NULL;
 		const git_index_entry *ours = NULL;
 		const git_index_entry *theirs = NULL;
-		
+
 		returnCode = git_index_conflict_next(&ancestor, &ours, &theirs, iterator);
 		if (returnCode == GIT_ITEROVER) break;
-		
+
 		if (returnCode != GIT_OK) {
 			if (error != NULL) *error = [NSError git_errorFor:returnCode description:NSLocalizedString(@"Could not iterate conflict.", nil)];
 			return NO;
 		}
-		
+
 		GTIndexEntry *blockAncestor;
 		if (ancestor != NULL) {
 			blockAncestor = [[GTIndexEntry alloc] initWithGitIndexEntry:ancestor];
@@ -297,7 +299,7 @@ - (BOOL)enumerateConflictedFilesWithError:(NSError **)error usingBlock:(void (^)
 		block(blockAncestor, blockOurs, blockTheirs, &stop);
 		if (stop) break;
 	}
-	
+
 	return YES;
 }
 
@@ -308,7 +310,7 @@ - (BOOL)enumerateConflictedFilesWithError:(NSError **)error usingBlock:(void (^)
 
 - (BOOL)updatePathspecs:(NSArray *)pathspecs error:(NSError **)error passingTest:(GTIndexPathspecMatchedBlock)block {
 	NSAssert(self.repository.isBare == NO, @"This method only works with non-bare repositories.");
-	
+
 	const git_strarray strarray = pathspecs.git_strarray;
 	struct GTIndexPathspecMatchedInfo payload = {
 		.block = block,
@@ -320,7 +322,7 @@ - (BOOL)updatePathspecs:(NSArray *)pathspecs error:(NSError **)error passingTest
 		if (error != nil) *error = [NSError git_errorFor:returnCode description:NSLocalizedString(@"Could not update index.", nil)];
 		return NO;
 	}
-	
+
 	return YES;
 }
 
@@ -330,11 +332,11 @@ int GTIndexPathspecMatchFound(const char *path, const char *matched_pathspec, vo
 	if (info->shouldAbortImmediately) {
 		return GIT_EUSER;
 	}
-	
+
 	BOOL shouldStop = NO;
 	NSString *matchedPathspec = (matched_pathspec != nil ? @(matched_pathspec): nil);
 	BOOL shouldUpdate = block(matchedPathspec, @(path), &shouldStop);
-	
+
 	if (shouldUpdate) {
 		if (shouldStop) {
 			info->shouldAbortImmediately = YES;

Classes/GTIndexEntry.h → ObjectiveGit/GTIndexEntry.h

@@ -27,6 +27,7 @@
 //  THE SOFTWARE.
 //
 
+#import <Foundation/Foundation.h>
 #include "git2.h"
 
 typedef NS_ENUM(NSInteger, GTIndexEntryStatus) {

Classes/GTObject.h → ObjectiveGit/GTObject.h

@@ -27,7 +27,8 @@
 //  THE SOFTWARE.
 //
 
-#include "git2.h"
+#import <Foundation/Foundation.h>
+#import "git2.h"
 
 typedef NS_ENUM(int, GTObjectType) {
 	GTObjectTypeAny = GIT_OBJ_ANY,				/**< Object can be any of the following */
@@ -80,4 +81,3 @@ typedef NS_ENUM(int, GTObjectType) {
 - (id)objectByPeelingToType:(GTObjectType)type error:(NSError **)error;
 
 @end
-