Merge pull request #355 from libgit2/purgatory

libgit2 updates, reset fixes, etc. etc.

Author: jspahrsummers

Classes/GTDiffFile.h

@@ -45,7 +45,11 @@ typedef enum {
 // The git_diff_file represented by the receiver.
 @property (nonatomic, readonly) git_diff_file git_diff_file;
 
-// Designated initialiser.
+/// Initializes the receiver with the provided libgit2 object.
+///
+/// file - The git_diff_file wrapped by the receiver.
+///
+/// Returns an initialized GTDiffFile.
 - (instancetype)initWithGitDiffFile:(git_diff_file)file;
 
 @end

Classes/GTDiffFile.m

@@ -12,16 +12,19 @@
 @implementation GTDiffFile
 
 - (instancetype)initWithGitDiffFile:(git_diff_file)file {
+	NSParameterAssert(file.path != NULL);
+
 	self = [super init];
 	if (self == nil) return nil;
-	
+
+	_path = [NSFileManager.defaultManager stringWithFileSystemRepresentation:file.path length:strlen(file.path)];
+	if (_path == nil) return nil;
+
 	_git_diff_file = file;
-	
 	_size = (NSUInteger)file.size;
 	_flags = (GTDiffFileFlag)file.flags;
 	_mode = file.mode;
-	_path = [NSString stringWithUTF8String:file.path];
-	
+
 	return self;
 }
 

Classes/GTSubmodule.m

@@ -72,7 +72,9 @@ - (NSString *)URLString {
 #pragma mark Lifecycle
 
 - (void)dealloc {
-	git_submodule_free(_git_submodule);
+	if (_git_submodule != NULL) {
+		git_submodule_free(_git_submodule);
+	}
 }
 
 - (id)initWithGitSubmodule:(git_submodule *)submodule parentRepository:(GTRepository *)repository {

External/libgit2

@@ -66,7 +66,8 @@
 	expect(@(git_submodule_url(submodule.git_submodule))).notTo.equal(testURLString);
 
 	git_submodule_set_url(submodule.git_submodule, testURLString.UTF8String);
-	
+	git_submodule_save(submodule.git_submodule);
+
 	__block NSError *error = nil;
 	expect([submodule writeToParentConfigurationDestructively:YES error:&error]).to.beTruthy();
 	expect(error).to.beNil();
@@ -87,9 +88,6 @@
 	[gitmodules appendString:@"[submodule \"new_submodule\"]\n\turl = some_url\n\tpath = new_submodule_path"];
 	expect([gitmodules writeToURL:gitmodulesURL atomically:YES encoding:NSUTF8StringEncoding error:NULL]).to.beTruthy();
 
-	submodule = [repo submoduleWithName:@"new_submodule" error:NULL];
-	expect(submodule).to.beNil();
-
 	__block NSError *error = nil;
 	expect([repo reloadSubmodules:&error]).to.beTruthy();
 	expect(error).to.beNil();