Merge branch 'master' into pull

# Conflicts:
#	ObjectiveGitFramework.xcodeproj/project.pbxproj

Author: phatblat

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "Carthage/Checkouts/xcconfigs"]
 	path = Carthage/Checkouts/xcconfigs
 	url = https://github.com/jspahrsummers/xcconfigs.git
+[submodule "Carthage/Checkouts/ZipArchive"]
+	path = Carthage/Checkouts/ZipArchive
+	url = https://github.com/ZipArchive/ZipArchive.git

Cartfile.private

@@ -1,3 +1,4 @@
 github "jspahrsummers/xcconfigs" >= 0.7.1
 github "Quick/Quick" ~> 0.3
 github "Quick/Nimble" ~> 0.4
+github "ZipArchive/ZipArchive" ~> 0.3

Cartfile.resolved

@@ -1,3 +1,4 @@
 github "Quick/Nimble" "v0.4.2"
 github "Quick/Quick" "v0.3.1"
+github "ZipArchive/ZipArchive" "v0.3.2"
 github "jspahrsummers/xcconfigs" "0.7.2"

Carthage/Checkouts/ZipArchive

@@ -132,9 +132,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns whether the calculation was successful.
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBranch *)branch error:(NSError **)error;
 
-#pragma mark Deprecations
-- (nullable GTCommit *)targetCommitAndReturnError:(NSError **)error __deprecated_msg("use targetCommitWithError: instead.");
-
 @end
 
 NS_ASSUME_NONNULL_END

External/libgit2

@@ -223,9 +223,4 @@ - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBra
 	return [self.repository calculateAhead:ahead behind:behind ofOID:self.OID relativeToOID:branch.OID error:error];
 }
 
-#pragma mark Deprecations
-- (GTCommit *)targetCommitAndReturnError:(NSError **)error {
-	return [self targetCommitWithError:error];
-}
-
 @end

ObjectiveGit/GTBranch.h

@@ -74,6 +74,18 @@ NS_ASSUME_NONNULL_BEGIN
 /// Return a new GTCredential instance, or nil if an error occurred
 + (nullable instancetype)credentialWithUserName:(NSString *)userName publicKeyURL:(nullable NSURL *)publicKeyURL privateKeyURL:(NSURL *)privateKeyURL passphrase:(nullable NSString *)passphrase error:(NSError **)error;
 
+/// Create a credential object from a SSH keyfile data string
+///
+/// userName         - The username to authenticate as.
+/// publicKeyString  - The string containing the public key for that user.
+///                     Can be omitted to reconstruct the public key from the private key.
+/// privateKeyString - The URL to the private key for that user.
+/// passphrase       - The passPhrase for the private key. Optional if the private key has no password.
+/// error            - If not NULL, set to any errors that occur.
+///
+/// Return a new GTCredential instance, or nil if an error occurred
++ (nullable instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(nullable NSString *)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(nullable NSString *)passphrase error:(NSError **)error;
+
 /// The underlying `git_cred` object.
 - (git_cred *)git_cred __attribute__((objc_returns_inner_pointer));
 

ObjectiveGit/GTBranch.m

@@ -71,6 +71,19 @@ + (instancetype)credentialWithUserName:(NSString *)userName publicKeyURL:(NSURL
 	return [[self alloc] initWithGitCred:cred];
 }
 
++ (instancetype)credentialWithUserName:(NSString *)userName publicKeyString:(NSString *)publicKeyString privateKeyString:(NSString *)privateKeyString passphrase:(NSString *)passphrase error:(NSError **)error {
+	NSParameterAssert(privateKeyString != nil);
+	
+	git_cred *cred;
+	int gitError = git_cred_ssh_key_memory_new(&cred, userName.UTF8String, publicKeyString.UTF8String, privateKeyString.UTF8String, passphrase.UTF8String);
+	if (gitError != GIT_OK) {
+		if (error) *error = [NSError git_errorFor:gitError description:@"Failed to create credentials object" failureReason:@"There was an error creating a credential object for username %@ with the provided public/private key pair.\nPublic key: %@\nPrivate key: %@", userName, publicKeyString, privateKeyString];
+		return nil;
+	}
+	
+	return [[self alloc] initWithGitCred:cred];
+}
+
 - (instancetype)initWithGitCred:(git_cred *)cred {
 	NSParameterAssert(cred != nil);
 	self = [self init];

ObjectiveGit/GTCredential.h

@@ -219,7 +219,7 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
 
 	git_remote_callbacks remote_callbacks = GIT_REMOTE_CALLBACKS_INIT;
 	remote_callbacks.credentials = (credProvider != nil ? GTCredentialAcquireCallback : NULL),
-	remote_callbacks.transfer_progress = GTRemoteFetchTransferProgressCallback,
+	remote_callbacks.push_transfer_progress = GTRemotePushTransferProgressCallback;
 	remote_callbacks.payload = &connectionInfo,
 
 	gitError = git_remote_connect(remote.git_remote, GIT_DIRECTION_PUSH, &remote_callbacks);
@@ -239,6 +239,8 @@ - (BOOL)pushRefspecs:(NSArray *)refspecs toRemote:(GTRemote *)remote withOptions
 		return NO;
 	}
 
+	push_options.callbacks = remote_callbacks;
+
 	const git_strarray git_refspecs = refspecs.git_strarray;
 
 	gitError = git_remote_upload(remote.git_remote, &git_refspecs, &push_options);