Merge remote-tracking branch 'upstream/master'

# Conflicts:
#	External/libgit2

Author: slavikus

.travis.yml

@@ -1,14 +1,17 @@
 osx_image: xcode7
 language: objective-c
 matrix:
+  fast_finish: true
   include:
-    - osx_image: xcode7
-      env: SCHEME="ObjectiveGit Mac"
-    - osx_image: xcode7
-      env: SCHEME="ObjectiveGit iOS"
+    - osx_image: xcode7.3
+      env:
+        - SCHEME="ObjectiveGit Mac"
+    - osx_image: xcode7.3
+      env:
+        - SCHEME="ObjectiveGit iOS"
 before_install:
-  - brew update
-  - brew outdated xctool || brew upgrade xctool
+  - gem install xcpretty
+  - gem install xcpretty-travis-formatter
 install: script/bootstrap
 script: script/cibuild
 notifications:

Cartfile.private

@@ -1,4 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
-github "Quick/Quick" ~> 0.9.1
-github "Quick/Nimble" ~> 3.1
+github "Quick/Quick" ~> 0.9.2
+github "Quick/Nimble" ~> 4.0
 github "ZipArchive/ZipArchive" ~> 1.1

Cartfile.resolved

@@ -1,4 +1,4 @@
-github "Quick/Nimble" "v3.1.0"
-github "Quick/Quick" "v0.9.1"
+github "Quick/Nimble" "v4.0.0"
+github "Quick/Quick" "v0.9.2"
 github "ZipArchive/ZipArchive" "v1.1"
 github "jspahrsummers/xcconfigs" "0.9"

Carthage/Checkouts/Nimble

@@ -43,13 +43,6 @@ @interface GTTreeBuilder ()
 @property (nonatomic, assign, readonly) git_treebuilder *git_treebuilder;
 @property (nonatomic, strong, readonly) GTRepository *repository;
 
-// Data to be written with the tree, keyed by the file name. This should only be
-// accessed while synchronized on self.
-//
-// This is needed because we don't want to add the entries to the object
-// database until the tree's been written.
-@property (nonatomic, strong, readonly) NSMutableDictionary *fileNameToPendingData;
-
 @end
 
 @implementation GTTreeBuilder
@@ -80,8 +73,6 @@ - (instancetype)initWithTree:(GTTree *)treeOrNil repository:(GTRepository *)repo
 	}
 
 	_repository = repository;
-	_fileNameToPendingData	= [NSMutableDictionary dictionary];
-
 	return self;
 }
 
@@ -122,12 +113,11 @@ - (GTTreeEntry *)addEntryWithData:(NSData *)data fileName:(NSString *)fileName f
 	NSParameterAssert(data != nil);
 	NSParameterAssert(fileName != nil);
 
-	GTOID *OID = [GTOID OIDByHashingData:data type:GTObjectTypeBlob error:error];
-	if (OID == nil) return nil;
+	GTObjectDatabase *odb = [self.repository objectDatabaseWithError:error];
+	if (odb == nil) return nil;
 
-	@synchronized (self) {
-		self.fileNameToPendingData[fileName] = data;
-	}
+	GTOID *OID = [odb writeData:data type:GTObjectTypeBlob error:error];
+	if (OID == nil) return nil;
 
 	return [self addEntryWithOID:OID fileName:fileName fileMode:fileMode error:error];
 }
@@ -153,38 +143,10 @@ - (BOOL)removeEntryWithFileName:(NSString *)fileName error:(NSError **)error {
 		if (error != NULL) *error = [NSError git_errorFor:status description:@"Failed to remove entry with name %@ from tree builder.", fileName];
 	}
 
-	@synchronized (self) {
-		[self.fileNameToPendingData removeObjectForKey:fileName];
-	}
-
 	return status == GIT_OK;
 }
 
-- (BOOL)writePendingData:(NSError **)error {
-	NSDictionary *copied;
-	@synchronized (self) {
-		copied = [self.fileNameToPendingData copy];
-		[self.fileNameToPendingData removeAllObjects];
-	}
-
-	if (copied.count != 0) {
-		GTObjectDatabase *odb = [self.repository objectDatabaseWithError:error];
-		if (odb == nil) return NO;
-
-		for (NSString *fileName in copied) {
-			NSData *data = copied[fileName];
-			GTOID *dataOID = [odb writeData:data type:GTObjectTypeBlob error:error];
-			if (dataOID == nil) return NO;
-		}
-	}
-
-	return YES;
-}
-
 - (GTTree *)writeTree:(NSError **)error {
-	BOOL success = [self writePendingData:error];
-	if (!success) return nil;
-
 	git_oid treeOid;
 	int status = git_treebuilder_write(&treeOid, self.git_treebuilder);
 	if (status != GIT_OK) {

Carthage/Checkouts/Quick

@@ -2235,7 +2235,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2281,7 +2280,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2328,7 +2326,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,
@@ -2375,7 +2372,6 @@
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				HEADER_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = "ObjectiveGitTests/ObjectiveGitTests-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				LIBRARY_SEARCH_PATHS = (
 					.,

ObjectiveGit/GTTreeBuilder.m

@@ -48,7 +48,7 @@
 	const git_oid *git_oid = NULL;
 
 	{
-		GTOID *testOID __attribute__((objc_precise_lifetime)) = [[GTOID alloc] initWithSHA:testSHA];
+		GTOID *testOID = [[GTOID alloc] initWithSHA:testSHA];
 		git_oid = testOID.git_oid;
 	}
 

ObjectiveGitFramework.xcodeproj/project.pbxproj

@@ -49,7 +49,7 @@
 	const git_signature *git_signature = NULL;
 
 	{
-		GTSignature *testSignature __attribute__((objc_precise_lifetime)) = [[GTSignature alloc] initWithName:name email:email time:time];
+		GTSignature *testSignature = [[GTSignature alloc] initWithName:name email:email time:time];
 		git_signature = testSignature.git_signature;
 	}
 

ObjectiveGitTests/GTOIDSpec.m

@@ -103,19 +103,17 @@
 		expect(foundEntry.SHA).to(equal(entry.SHA));
 	});
 
-	it(@"should write new blobs when the tree is written", ^{
+	it(@"should be possible to write a blob with data", ^{
 		GTTreeEntry *entry = [builder addEntryWithData:[@"Hello, World!" dataUsingEncoding:NSUTF8StringEncoding] fileName:@"test.txt" fileMode:GTFileModeBlob error:NULL];
 		expect(entry).notTo(beNil());
 
 		GTObjectDatabase *database = [repo objectDatabaseWithError:NULL];
 		expect(database).notTo(beNil());
 
-		expect(@([database containsObjectWithOID:entry.OID])).to(beFalsy());
+		expect(@([database containsObjectWithOID:entry.OID])).to(beTruthy());
 
 		GTTree *tree = [builder writeTree:NULL];
 		expect(tree).notTo(beNil());
-
-		expect(@([database containsObjectWithOID:entry.OID])).to(beTruthy());
 	});
 
 	it(@"should be possible to write a builder to a repository", ^{