🔥 -allBranchesWithError:

Use -branches: from now on.

Author: joshaber

ObjectiveGit/GTRepository.h

@@ -242,9 +242,6 @@ extern NSString * const GTRepositoryInitOptionsOriginURLString;
 
 - (GTReference *)headReferenceWithError:(NSError **)error;
 
-/// Convenience methods to return branches in the repository
-- (NSArray *)allBranchesWithError:(NSError **)error;
-
 - (NSArray *)localBranchesWithError:(NSError **)error;
 - (NSArray *)remoteBranchesWithError:(NSError **)error;
 - (NSArray *)branchesWithPrefix:(NSString *)prefix error:(NSError **)error;

ObjectiveGit/GTRepository.m

@@ -401,30 +401,6 @@ - (NSArray *)branchesWithPrefix:(NSString *)prefix error:(NSError **)error {
 	return branches;
 }
 
-- (NSArray *)allBranchesWithError:(NSError **)error {
-	NSMutableArray *allBranches = [NSMutableArray array];
-	NSArray *localBranches = [self localBranchesWithError:error];
-	NSArray *remoteBranches = [self remoteBranchesWithError:error];
-	if (localBranches == nil || remoteBranches == nil) return nil;
-
-	[allBranches addObjectsFromArray:localBranches];
-
-	// we want to add the remote branches that we don't already have as a local branch
-	NSMutableDictionary *shortNamesToBranches = [NSMutableDictionary dictionary];
-	for (GTBranch *branch in localBranches) {
-		[shortNamesToBranches setObject:branch forKey:branch.shortName];
-	}
-
-	for (GTBranch *branch in remoteBranches) {
-		GTBranch *localBranch = [shortNamesToBranches objectForKey:branch.shortName];
-		if (localBranch == nil) {
-			[allBranches addObject:branch];
-		}
-	}
-
-    return allBranches;
-}
-
 - (NSArray *)branches:(NSError **)error {
 	NSArray *localBranches = [self localBranchesWithError:error];
 	if (localBranches == nil) return nil;

ObjectiveGitTests/GTIndexSpec.m

@@ -52,7 +52,7 @@
 
 it(@"should write to a specific repository and return a tree", ^{
 	GTRepository *repository = self.bareFixtureRepository;
-	NSArray *branches = [repository allBranchesWithError:NULL];
+	NSArray *branches = [repository branches:NULL];
 	GTCommit *masterCommit = [branches[0] targetCommitAndReturnError:NULL];
 	GTCommit *packedCommit = [branches[1] targetCommitAndReturnError:NULL];