GTTreeEntry now creates a copy of the respective git_tree_entry during initialisation. The resulting git_tree_entry is thus solely owned (and freed) by GTTreeEntry

Author: Jan Gassen

ObjectiveGit/GTTree.m

@@ -56,27 +56,29 @@ - (NSUInteger)entryCount {
 	return (NSUInteger)git_tree_entrycount(self.git_tree);
 }
 
-- (GTTreeEntry *)createEntryWithCopyOfEntry:(const git_tree_entry *)entry {
-	return (entry != NULL ? [GTTreeEntry entryWithCopyOfEntry:entry parentTree:self error:nil] : nil);
+- (GTTreeEntry *)createEntryWithEntry:(const git_tree_entry *)entry error:(NSError **)error {
+	return (entry != NULL ? [GTTreeEntry entryWithEntry:entry parentTree:self error:nil] : nil);
 }
 
 - (GTTreeEntry *)entryAtIndex:(NSUInteger)index {
-	return [self createEntryWithCopyOfEntry:git_tree_entry_byindex(self.git_tree, index)];
+	return [self createEntryWithEntry:git_tree_entry_byindex(self.git_tree, index) error:nil];
 }
 
 - (GTTreeEntry *)entryWithName:(NSString *)name {
-	return [self createEntryWithCopyOfEntry:git_tree_entry_byname(self.git_tree, name.UTF8String)];
+	return [self createEntryWithEntry:git_tree_entry_byname(self.git_tree, name.UTF8String) error:nil];
 }
 
 - (GTTreeEntry *)entryWithPath:(NSString *)path error:(NSError **)error {
-	git_tree_entry *entry = NULL;
-	int gitError = git_tree_entry_bypath(&entry, self.git_tree, path.UTF8String);
+	git_tree_entry *internalEntry = NULL;
+	int gitError = git_tree_entry_bypath(&internalEntry, self.git_tree, path.UTF8String);
 	if (error != GIT_OK) {
-		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get tree ntry %@", path];
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get tree entry %@", path];
 		return nil;
 	}
 
-	return [GTTreeEntry entryWithEntry:entry parentTree:self];
+	GTTreeEntry *entry = [self createEntryWithEntry:internalEntry error:error];
+	git_tree_entry_free(internalEntry);
+	return entry;
 }
 
 - (git_tree *)git_tree {
@@ -90,7 +92,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 entryWithCopyOfEntry:git_entry parentTree:parentTree error:nil];
+	GTTreeEntry *entry = [GTTreeEntry entryWithEntry: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 entryWithCopyOfEntry:entry parentTree:nil error:nil];
+	return [GTTreeEntry entryWithEntry: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 entryWithCopyOfEntry:entry parentTree:nil error:nil];
+	return [GTTreeEntry entryWithEntry:entry parentTree:nil error:error];
 }
 
 - (BOOL)removeEntryWithFileName:(NSString *)fileName error:(NSError **)error {

ObjectiveGit/GTTreeEntry.h

@@ -34,9 +34,8 @@
 @interface GTTreeEntry : NSObject
 
 /// Initializer and convience methods.
-- (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;
+- (instancetype)initWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError **)error;
++ (instancetype)entryWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError **)error;
 
 /// The underlying `git_tree_entry`.
 - (git_tree_entry *)git_tree_entry __attribute__((objc_returns_inner_pointer));

ObjectiveGit/GTTreeEntry.m

@@ -70,30 +70,27 @@ - (void)dealloc {
 
 #pragma mark API
 
-- (instancetype)initWithEntry:(git_tree_entry *)theEntry parentTree:(GTTree *)parent {
-	NSParameterAssert(theEntry != NULL);
-	if((self = [super init])) {
-		_git_tree_entry = theEntry;
-		_tree = parent;
-	}
-	return self;
-}
-
-+ (instancetype)entryWithEntry:(git_tree_entry *)theEntry parentTree:(GTTree *)parent {
-	return [[self alloc] initWithEntry:theEntry parentTree:parent];
-}
-
-+ (instancetype)entryWithCopyOfEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError **)error{
+- (instancetype)initWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError **)error {
 	NSParameterAssert(theEntry != NULL);
+	
+	self = [super init];
+	if (self == nil) return nil;
+	
 	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."];
-		}
+		if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to duplicate tree entry."];
 		return nil;
 	}
-	return [GTTreeEntry entryWithEntry:copyOfEntry parentTree:parent];
+	
+	_git_tree_entry = copyOfEntry;
+	_tree = parent;
+
+	return self;
+}
+
++ (instancetype)entryWithEntry:(const git_tree_entry *)theEntry parentTree:(GTTree *)parent error:(NSError **)error {
+	return [[self alloc] initWithEntry:theEntry parentTree:parent error:error];
 }
 
 - (NSString *)name {