Refactored last commit, so that GTTreeEntry is now assumed to own the respective git_tree_entry and is responsible for freeing it.

Therefore, the type of the field has been changed to git_tree_entry* (without the const). To easily create a GTTreeEntry from a managed const git_tree_entry*, a factory method exists to duplicate git_tree_entry and create a new GTTreeEntry

Author: Jan Gassen

ObjectiveGit/GTDiffPatch.h

@@ -50,8 +50,8 @@
 /// Returns the raw size of the delta, in bytes.
 - (NSUInteger)sizeWithContext:(BOOL)includeContext hunkHeaders:(BOOL)includeHunkHeaders fileHeaders:(BOOL)includeFileHeaders;
 
-/// Returns the raw patch data as buffer.
-- (NSData*)toBuffer;
+/// Returns the raw patch data.
+- (NSData*)patchData;
 
 /// Enumerate the hunks contained in the patch.
 ///

ObjectiveGit/GTDiffPatch.m

@@ -59,7 +59,7 @@ - (NSUInteger)sizeWithContext:(BOOL)includeContext hunkHeaders:(BOOL)includeHunk
 	return git_patch_size(self.git_patch, includeContext, includeHunkHeaders, includeFileHeaders);
 }
 
-- (NSData*)toBuffer {
+- (NSData*)patchData {
 	git_buf buf = GIT_BUF_INIT_CONST(0, NULL);
 	git_patch_to_buf(&buf, self.git_patch);
 

ObjectiveGit/GTTree.h

@@ -64,7 +64,12 @@ typedef NS_ENUM(NSInteger, GTTreeEnumerationOptions) {
 /// returns a GTTreeEntry or nil if there is nothing with the specified name
 - (GTTreeEntry *)entryWithName:(NSString *)name;
 
-- (GTTreeEntry*) treeEntryByPath:(NSString*) path error:(NSError**)error;
+/// Get a entry by path
+///
+/// path - the path of the entry relative to the repository root
+///
+/// returns a GTTreeEntry or nil if there is nothing with the specified path
+- (GTTreeEntry*)entryWithPath:(NSString*)path error:(NSError**)error;
 
 /// Enumerates the contents of the tree
 ///

ObjectiveGit/GTTree.m

@@ -56,27 +56,27 @@ - (NSUInteger)entryCount {
 	return (NSUInteger)git_tree_entrycount(self.git_tree);
 }
 
-- (GTTreeEntry *)createEntryWithEntry:(const git_tree_entry *)entry {
-	return (entry != NULL ? [GTTreeEntry entryWithEntry:entry parentTree:self] : nil);
+- (GTTreeEntry *)createEntryWithCopyOfEntry:(const git_tree_entry *)entry {
+	return (entry != NULL ? [GTTreeEntry entryWithCopyOfEntry:entry parentTree:self error:nil] : nil);
 }
 
 - (GTTreeEntry *)entryAtIndex:(NSUInteger)index {
-	return [self createEntryWithEntry:git_tree_entry_byindex(self.git_tree, index)];
+	return [self createEntryWithCopyOfEntry:git_tree_entry_byindex(self.git_tree, index)];
 }
 
 - (GTTreeEntry *)entryWithName:(NSString *)name {
-	return [self createEntryWithEntry:git_tree_entry_byname(self.git_tree, name.UTF8String)];
+	return [self createEntryWithCopyOfEntry:git_tree_entry_byname(self.git_tree, name.UTF8String)];
 }
 
-- (GTTreeEntry*) treeEntryByPath:(NSString*)path error:(NSError**)error {
+- (GTTreeEntry*)entryWithPath:(NSString*)path error:(NSError**)error {
 	git_tree_entry *entry = NULL;
 	int gitError = git_tree_entry_bypath(&entry, self.git_tree, path.UTF8String);
 	if (error != GIT_OK) {
 		*error = [NSError git_errorFor:gitError description:@"Failed to get tree ntry %@", path];
 		return nil;
 	}
 
-	return [GTTreeEntry entryWithEntryToFree:entry parentTree:self];
+	return [GTTreeEntry entryWithEntry:entry parentTree:self];
 }
 
 - (git_tree *)git_tree {
@@ -90,7 +90,7 @@ static int treewalk_cb(const char *root, const git_tree_entry *git_entry, void *
 	NSString *rootString = @(root);
 	GTTreeEntry *parentEntry = enumerationStruct->directoryStructure[rootString];
 	GTTree *parentTree = parentEntry != nil ? parentEntry.tree : enumerationStruct->myself;
-	GTTreeEntry *entry = [GTTreeEntry entryWithEntry:git_entry parentTree:parentTree];
+	GTTreeEntry *entry = [GTTreeEntry entryWithCopyOfEntry:git_entry parentTree:parentTree error:nil];
 
 	if (entry.type == GTObjectTypeTree) {
 		NSString *path = [rootString stringByAppendingPathComponent:entry.name];

ObjectiveGit/GTTreeBuilder.m

@@ -110,7 +110,7 @@ - (GTTreeEntry *)entryWithFileName:(NSString *)fileName {
 	const git_tree_entry *entry = git_treebuilder_get(self.git_treebuilder, fileName.UTF8String);
 	if (entry == NULL) return nil;
 
-	return [GTTreeEntry entryWithEntry:entry parentTree:nil];
+	return [GTTreeEntry entryWithCopyOfEntry:entry parentTree:nil error:nil];
 }
 
 - (GTTreeEntry *)addEntryWithData:(NSData *)data fileName:(NSString *)fileName fileMode:(GTFileMode)fileMode error:(NSError **)error {
@@ -139,7 +139,7 @@ - (GTTreeEntry *)addEntryWithOID:(GTOID *)oid fileName:(NSString *)fileName file
 		return nil;
 	}
 
-	return [GTTreeEntry entryWithEntry:entry parentTree:nil];
+	return [GTTreeEntry entryWithCopyOfEntry:entry parentTree:nil error:nil];
 }
 
 - (BOOL)removeEntryWithFileName:(NSString *)fileName error:(NSError **)error {

ObjectiveGit/GTTreeEntry.h

@@ -34,13 +34,12 @@
 @interface GTTreeEntry : NSObject
 
 /// Initializer and convience methods.
-- (instancetype)initWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent;
-- (instancetype)initWithEntryToFree:(git_tree_entry *)theEntry parentTree:(GTTree *)parent;
-+ (instancetype)entryWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent;
-+ (instancetype)entryWithEntryToFree:(git_tree_entry *)theEntry parentTree:(GTTree *)parent;
+- (instancetype)initWithEntry:(git_tree_entry *)theEntry parentTree:(GTTree *)parent;
++ (instancetype)entryWithEntry:(git_tree_entry *)theEntry parentTree:(GTTree *)parent;
++ (instancetype)entryWithCopyOfEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError**)error;
 
 /// The underlying `git_tree_entry`.
-- (const git_tree_entry *)git_tree_entry __attribute__((objc_returns_inner_pointer));
+- (git_tree_entry *)git_tree_entry __attribute__((objc_returns_inner_pointer));
 
 /// The entry's parent tree. This may be nil if nil is passed in to -initWithEntry:
 @property (nonatomic, strong, readonly) GTTree *tree;

ObjectiveGit/GTTreeEntry.m

@@ -38,8 +38,7 @@
 #import "git2/errors.h"
 
 @interface GTTreeEntry ()
-@property (nonatomic, assign, readonly) const git_tree_entry *git_tree_entry;
-@property (nonatomic, assign, readonly) git_tree_entry* entry_to_free;
+@property (nonatomic, assign, readonly) git_tree_entry *git_tree_entry;
 @end
 
 @implementation GTTreeEntry
@@ -66,39 +65,35 @@ - (BOOL)isEqualToEntry:(GTTreeEntry *)treeEntry {
 }
 
 - (void)dealloc {
-	if (_entry_to_free != nil) {
-		git_tree_entry_free(_entry_to_free);
-	}
+	git_tree_entry_free(_git_tree_entry);
 }
 
 #pragma mark API
 
-- (instancetype)initWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent {
+- (instancetype)initWithEntry:(git_tree_entry *)theEntry parentTree:(GTTree *)parent {
 	NSParameterAssert(theEntry != NULL);
 	if((self = [super init])) {
 		_git_tree_entry = theEntry;
 		_tree = parent;
-		_entry_to_free = nil;
 	}
 	return self;
 }
 
-- (instancetype)initWithEntryToFree:(git_tree_entry *)theEntry parentTree:(GTTree *)parent {
-	NSParameterAssert(theEntry != NULL);
-	if((self = [super init])) {
-		_git_tree_entry = theEntry;
-		_tree = parent;
-		_entry_to_free = theEntry;
-	}
-	return self;
-}
-
-+ (instancetype)entryWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent {
++ (instancetype)entryWithEntry:(git_tree_entry *)theEntry parentTree:(GTTree *)parent {
 	return [[self alloc] initWithEntry:theEntry parentTree:parent];
 }
 
-+ (instancetype)entryWithEntryToFree:(git_tree_entry *)theEntry parentTree:(GTTree *)parent {
-	return [[self alloc] initWithEntryToFree:theEntry parentTree:parent];
++ (instancetype)entryWithCopyOfEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError**)error{
+	NSParameterAssert(theEntry != NULL);
+	git_tree_entry* copyOfEntry = nil;
+	int gitError = git_tree_entry_dup(&copyOfEntry, theEntry);
+	if (gitError != GIT_OK) {
+		if (error != NULL) {
+			*error = [NSError git_errorFor:gitError description:@"Failed to duplicate tree entry."];
+		}
+		return nil;
+	}
+	return [GTTreeEntry entryWithEntry:copyOfEntry parentTree:parent];
 }
 
 - (NSString *)name {

ObjectiveGitFramework.xcodeproj/project.pbxproj

@@ -412,7 +412,6 @@
 		30DCBA7017B4791A009B0EBD /* NSArray+StringArray.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSArray+StringArray.m"; sourceTree = "<group>"; };
 		30FDC07D16835A8100654BF0 /* GTDiffLine.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = GTDiffLine.h; sourceTree = "<group>"; };
 		30FDC07E16835A8100654BF0 /* GTDiffLine.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTDiffLine.m; sourceTree = "<group>"; };
-		3D6123BB1A643296008F831A /* libgit2.0.21.2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libgit2.0.21.2.dylib; path = ../../../../../usr/local/Cellar/libgit2/0.21.2/lib/libgit2.0.21.2.dylib; sourceTree = "<group>"; };
 		4D103ADC1819CFAA0029DB24 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
 		4D12323F178E009E0048F785 /* GTRepositoryCommittingSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTRepositoryCommittingSpec.m; sourceTree = "<group>"; };
 		4D1C40D7182C006D00BE2960 /* GTBlobSpec.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GTBlobSpec.m; sourceTree = "<group>"; };
@@ -621,7 +620,6 @@
 		0867D691FE84028FC02AAC07 /* ObjectiveGitFramework */ = {
 			isa = PBXGroup;
 			children = (
-				3D6123BB1A643296008F831A /* libgit2.0.21.2.dylib */,
 				BDD8AB01130F01AB00CB5D40 /* README.md */,
 				887B948D1A3A38130070D41D /* ObjectiveGit.modulemap */,
 				BDE4C05E130EFE2C00851650 /* ObjectiveGit */,
@@ -1451,10 +1449,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/local/Cellar/libgit2/0.21.2/lib,
-				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
@@ -1478,10 +1472,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/local/Cellar/libgit2/0.21.2/lib,
-				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
@@ -1666,10 +1656,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/local/Cellar/libgit2/0.21.2/lib,
-				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",
@@ -1887,10 +1873,6 @@
 				DYLIB_CURRENT_VERSION = 1;
 				FRAMEWORK_VERSION = A;
 				INFOPLIST_FILE = Info.plist;
-				LIBRARY_SEARCH_PATHS = (
-					"$(inherited)",
-					/usr/local/Cellar/libgit2/0.21.2/lib,
-				);
 				MODULEMAP_FILE = ObjectiveGit.modulemap;
 				OTHER_LDFLAGS = (
 					"-lgit2",