Merge pull request #423 from libgit2/bump-libgit2

Bump libgit2 to bring in gitignore fixes

Author: mdiep

External/libgit2

@@ -42,12 +42,4 @@
 
 - (BOOL)deleteValueForKey:(NSString *)key error:(NSError **)error;
 
-/// Reloads the configuration from the files on disk if they have changed since
-/// it was originally loaded.
-///
-/// error - The error if one occurred.
-///
-/// Returns whether the refresh was successful.
-- (BOOL)refresh:(NSError **)error;
-
 @end

ObjectiveGit/GTConfiguration.h

@@ -130,7 +130,7 @@ - (NSArray *)remotes {
 		const char *name = names.strings[i];
 		git_remote *remote = NULL;
 
-		if (git_remote_load(&remote, repository.git_repository, name) == 0) {
+		if (git_remote_lookup(&remote, repository.git_repository, name) == 0) {
 			[remotes addObject:[[GTRemote alloc] initWithGitRemote:remote inRepository:repository]];
 		}
 	}
@@ -140,17 +140,4 @@ - (NSArray *)remotes {
 	return remotes;
 }
 
-#pragma mark Refresh
-
-- (BOOL)refresh:(NSError **)error {
-	int success = git_config_refresh(self.git_config);
-	if (success != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:success description:@"Couldn't reload the configuration from disk."];
-
-		return NO;
-	}
-
-	return YES;
-}
-
 @end

ObjectiveGit/GTConfiguration.m

@@ -62,9 +62,6 @@ typedef enum {
 /// `+refs/heads/*:refs/remotes/REMOTE/*`.
 @property (nonatomic, readonly, copy) NSArray *pushRefspecs;
 
-/// Tests if a URL is supported (e.g. it's a supported URL scheme)
-+ (BOOL)isSupportedURLString:(NSString *)URLString;
-
 /// Tests if a name is valid
 + (BOOL)isValidRemoteName:(NSString *)name;
 

ObjectiveGit/GTRemote.h

@@ -50,7 +50,7 @@ + (instancetype)remoteWithName:(NSString *)name inRepository:(GTRepository *)rep
 	NSParameterAssert(repo != nil);
 
 	git_remote *remote;
-	int gitError = git_remote_load(&remote, repo.git_repository, name.UTF8String);
+	int gitError = git_remote_lookup(&remote, repo.git_repository, name.UTF8String);
 	if (gitError != GIT_OK) {
 		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Remote loading failed" failureReason:nil];
 
@@ -92,12 +92,6 @@ - (NSUInteger)hash {
 
 #pragma mark API
 
-+ (BOOL)isSupportedURLString:(NSString *)URLString {
-	NSParameterAssert(URLString != nil);
-
-	return git_remote_supported_url(URLString.UTF8String) == GIT_OK;
-}
-
 + (BOOL)isValidRemoteName:(NSString *)name {
 	NSParameterAssert(name != nil);
 
@@ -162,7 +156,7 @@ - (BOOL)rename:(NSString *)name error:(NSError **)error {
 
 	git_strarray problematic_refspecs;
 
-	int gitError = git_remote_rename(&problematic_refspecs, self.git_remote, name.UTF8String);
+	int gitError = git_remote_rename(&problematic_refspecs, self.repository.git_repository, git_remote_name(self.git_remote), name.UTF8String);
 	if (gitError != GIT_OK) {
 		NSArray *problematicRefspecs = [NSArray git_arrayWithStrarray:problematic_refspecs];
 		NSDictionary *userInfo = [NSDictionary dictionaryWithObject:problematicRefspecs forKey:GTRemoteRenameProblematicRefSpecs];

ObjectiveGit/GTRemote.m

@@ -6,9 +6,9 @@
 //  Copyright (c) 2012 GitHub, Inc. All rights reserved.
 //
 
-#import "git2/threads.h"
+#import "git2/global.h"
 
 __attribute__((constructor))
-static void GTSetupThreads(void) {
-	git_threads_init();
+static void GTSetup(void) {
+	git_libgit2_init();
 }

ObjectiveGit/ObjectiveGit.m

@@ -253,15 +253,12 @@
 
 		NSString *configKey = @"submodule.Test_App2.url";
 		NSString *newOrigin = @"https://github.com/libgit2/objective-git.git";
-		[config setString:newOrigin forKey:configKey];
 
-		expect(@([config refresh:NULL])).to(beTruthy());
+		[config setString:newOrigin forKey:configKey];
 		expect([config stringForKey:configKey]).to(equal(newOrigin));
 
 		__block NSError *error = nil;
 		expect(@([submodule sync:&error])).to(beTruthy());
-
-		expect(@([config refresh:NULL])).to(beTruthy());
 		expect([config stringForKey:configKey]).to(equal(@"../Test_App"));
 	});
 });