Use the reference's repository instead of asking for one

Author: tiennou

ObjectiveGit/GTBranch.h

@@ -59,18 +59,16 @@ NS_ASSUME_NONNULL_BEGIN
 /// Designated initializer.
 ///
 /// ref  - The branch reference to wrap. Must not be nil.
-/// repo - The repository containing the branch. Must not be nil.
 ///
 /// Returns the initialized receiver.
-- (instancetype _Nullable)initWithReference:(GTReference *)ref repository:(GTRepository *)repo NS_DESIGNATED_INITIALIZER;
+- (instancetype _Nullable)initWithReference:(GTReference *)ref NS_DESIGNATED_INITIALIZER;
 
 /// Convenience class initializer.
 ///
 /// ref  - The branch reference to wrap. Must not be nil.
-/// repo - The repository containing the branch. Must not be nil.
 ///
 /// Returns an initialized instance.
-+ (instancetype _Nullable)branchWithReference:(GTReference *)ref repository:(GTRepository *)repo;
++ (instancetype _Nullable)branchWithReference:(GTReference *)ref;
 
 /// Get the target commit for this branch
 ///

ObjectiveGit/GTBranch.m

@@ -65,23 +65,21 @@ + (NSString *)remoteNamePrefix {
 	return @"refs/remotes/";
 }
 
-+ (instancetype)branchWithReference:(GTReference *)ref repository:(GTRepository *)repo {
-	return [[self alloc] initWithReference:ref repository:repo];
++ (instancetype)branchWithReference:(GTReference *)ref {
+	return [[self alloc] initWithReference:ref];
 }
 
 - (instancetype)init {
 	NSAssert(NO, @"Call to an unavailable initializer.");
 	return nil;
 }
 
-- (instancetype)initWithReference:(GTReference *)ref repository:(GTRepository *)repo {
+- (instancetype)initWithReference:(GTReference *)ref {
 	NSParameterAssert(ref != nil);
-	NSParameterAssert(repo != nil);
 
 	self = [super init];
 	if (self == nil) return nil;
 
-	_repository = repo;
 	_reference = ref;
 
 	return self;
@@ -142,6 +140,10 @@ - (NSUInteger)numberOfCommitsWithError:(NSError **)error {
 	return [enumerator countRemainingObjects:error];
 }
 
+- (GTRepository *)repository {
+	return self.reference.repository;
+}
+
 - (GTBranchType)branchType {
 	if (self.reference.remote) {
 		return GTBranchTypeRemote;
@@ -194,7 +196,7 @@ - (GTBranch *)trackingBranchWithError:(NSError **)error success:(BOOL *)success
 
 	if (success != NULL) *success = YES;
 
-	return [[self class] branchWithReference:[[GTReference alloc] initWithGitReference:trackingRef repository:self.repository] repository:self.repository];
+	return [[self class] branchWithReference:[[GTReference alloc] initWithGitReference:trackingRef repository:self.repository]];
 }
 
 - (BOOL)updateTrackingBranch:(GTBranch *)trackingBranch error:(NSError **)error {
@@ -216,7 +218,7 @@ - (GTBranch *)reloadedBranchWithError:(NSError **)error {
 	GTReference *reloadedRef = [self.reference reloadedReferenceWithError:error];
 	if (reloadedRef == nil) return nil;
 
-	return [[self.class alloc] initWithReference:reloadedRef repository:self.repository];
+	return [[self.class alloc] initWithReference:reloadedRef];
 }
 
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBranch *)branch error:(NSError **)error {

ObjectiveGit/GTRepository.m

@@ -325,7 +325,7 @@ - (id)lookUpObjectByGitOid:(const git_oid *)oid objectType:(GTObjectType)type er
 		return nil;
 	}
 
-    return [GTObject objectWithObj:obj inRepository:self];
+	return [GTObject objectWithObj:obj inRepository:self];
 }
 
 - (id)lookUpObjectByGitOid:(const git_oid *)oid error:(NSError **)error {
@@ -377,7 +377,7 @@ - (GTBranch *)lookUpBranchWithName:(NSString *)branchName type:(GTBranchType)bra
 	if (ref == NULL) return nil;
 
 	GTReference *gtRef = [[GTReference alloc] initWithGitReference:ref repository:self];
-	return [[GTBranch alloc] initWithReference:gtRef repository:self];
+	return [[GTBranch alloc] initWithReference:gtRef];
 }
 
 - (GTReference *)headReferenceWithError:(NSError **)error {
@@ -409,7 +409,7 @@ - (BOOL)enumerateBranchesWithType:(GTBranchType)type error:(NSError **)error usi
 	git_branch_t branchType;
 	while ((gitError = git_branch_next(&gitRef, &branchType, iter)) == GIT_OK) {
 		GTReference *ref = [[GTReference alloc] initWithGitReference:gitRef repository:self];
-		GTBranch *branch = [GTBranch branchWithReference:ref repository:self];
+		GTBranch *branch = [GTBranch branchWithReference:ref];
 		BOOL stop = NO;
 		block(branch, &stop);
 		if (stop) break;
@@ -457,7 +457,7 @@ - (NSArray *)branchesWithPrefix:(NSString *)prefix error:(NSError **)error {
 		GTReference *ref = [self lookUpReferenceWithName:refName error:error];
 		if (ref == nil) continue;
 
-		GTBranch *branch = [[GTBranch alloc] initWithReference:ref repository:self];
+		GTBranch *branch = [[GTBranch alloc] initWithReference:ref];
 		if (branch == nil) continue;
 
 		[branches addObject:branch];
@@ -594,7 +594,7 @@ - (GTBranch *)createBranchNamed:(NSString *)name fromOID:(GTOID *)targetOID mess
 	GTReference *newRef = [self createReferenceNamed:[GTBranch.localNamePrefix stringByAppendingString:name] fromOID:targetOID message:message error:error];
 	if (newRef == nil) return nil;
 
-	return [GTBranch branchWithReference:newRef repository:self];
+	return [GTBranch branchWithReference:newRef];
 }
 
 - (BOOL)isEmpty {
@@ -605,7 +605,7 @@ - (GTBranch *)currentBranchWithError:(NSError **)error {
 	GTReference *head = [self headReferenceWithError:error];
 	if (head == nil) return nil;
 
-	return [GTBranch branchWithReference:head repository:self];
+	return [GTBranch branchWithReference:head];
 }
 
 - (NSArray *)localCommitsRelativeToRemoteBranch:(GTBranch *)remoteBranch error:(NSError **)error {

ObjectiveGitTests/GTBranchSpec.m

@@ -163,7 +163,7 @@
 		expect(otherRef).notTo(beNil());
 		expect(error).to(beNil());
 
-		GTBranch *otherBranch = [GTBranch branchWithReference:otherRef repository:repository];
+		GTBranch *otherBranch = [GTBranch branchWithReference:otherRef];
 		expect(otherBranch).notTo(beNil());
 
 		BOOL success = NO;
@@ -179,7 +179,7 @@
 		expect(remoteRef).notTo(beNil());
 		expect(error).to(beNil());
 
-		GTBranch *remoteBranch = [GTBranch branchWithReference:remoteRef repository:repository];
+		GTBranch *remoteBranch = [GTBranch branchWithReference:remoteRef];
 		expect(remoteBranch).notTo(beNil());
 
 		BOOL success = NO;

ObjectiveGitTests/GTUtilityFunctions.m

@@ -16,7 +16,7 @@
 
 CreateCommitBlock createCommitInRepository = ^ GTCommit * (NSString *message, NSData *fileData, NSString *fileName, GTRepository *repo) {
 	GTReference *head = [repo headReferenceWithError:NULL];
-	GTBranch *branch = [GTBranch branchWithReference:head repository:repo];
+	GTBranch *branch = [GTBranch branchWithReference:head];
 	GTCommit *headCommit = [branch targetCommitWithError:NULL];
 
 	GTTreeBuilder *treeBuilder = [[GTTreeBuilder alloc] initWithTree:headCommit.tree repository:repo error:nil];