Merge remote-tracking branch 'origin/master' into xcode6

Author: jspahrsummers

External/libgit2

@@ -67,7 +67,18 @@ - (BOOL)fetchRemote:(GTRemote *)remote withOptions:(NSDictionary *)options error
 		return NO;
 	}
 
-	gitError = git_remote_fetch(remote.git_remote, self.userSignatureForNow.git_signature, NULL);
+	__block git_strarray refspecs;
+	gitError = git_remote_get_fetch_refspecs(&refspecs, remote.git_remote);
+	if (gitError != GIT_OK) {
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get fetch refspecs for remote"];
+		return NO;
+	}
+
+	@onExit {
+		git_strarray_free(&refspecs);
+	};
+
+	gitError = git_remote_fetch(remote.git_remote, &refspecs, self.userSignatureForNow.git_signature, NULL);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to fetch from remote"];
 		return NO;

ObjectiveGit/GTRepository+RemoteOperations.m

@@ -17,7 +17,8 @@ @implementation GTRepository (Reset)
 - (BOOL)resetToCommit:(GTCommit *)commit resetType:(GTRepositoryResetType)resetType error:(NSError **)error {
 	NSParameterAssert(commit != nil);
 
-	int gitError = git_reset(self.git_repository, commit.git_object, (git_reset_t)resetType, (git_signature *)[self userSignatureForNow].git_signature, NULL);
+	git_checkout_options options = GIT_CHECKOUT_OPTIONS_INIT;
+	int gitError = git_reset(self.git_repository, commit.git_object, (git_reset_t)resetType, &options, (git_signature *)[self userSignatureForNow].git_signature, NULL);
 	if (gitError != GIT_OK) {
 		if (error != NULL) {
 			*error = [NSError git_errorFor:gitError description:@"Failed to reset repository to commit %@.", commit.SHA];