A Nu Branches.

Author: joshaber

ObjectiveGit/GTRepository.h

@@ -249,6 +249,14 @@ extern NSString * const GTRepositoryInitOptionsOriginURLString;
 - (NSArray *)remoteBranchesWithError:(NSError **)error;
 - (NSArray *)branchesWithPrefix:(NSString *)prefix error:(NSError **)error;
 
+/// Get the local and remote branches and merge them together by combining local
+/// branches with their remote branch, if they have one.
+///
+/// error - The error if one occurs.
+///
+/// Returns the branches or nil if an error occurs.
+- (NSArray *)branches:(NSError **)error;
+
 /// List all remotes in the repository
 ///
 /// error - will be filled if an error occurs

ObjectiveGit/GTRepository.m

@@ -425,6 +425,28 @@ - (NSArray *)allBranchesWithError:(NSError **)error {
     return allBranches;
 }
 
+- (NSArray *)branches:(NSError **)error {
+	NSArray *localBranches = [self localBranchesWithError:error];
+	if (localBranches == nil) return nil;
+
+	NSMutableArray *remoteBranches = [[self remoteBranchesWithError:error] mutableCopy];
+	if (remoteBranches == nil) return nil;
+
+	NSMutableArray *branches = [NSMutableArray array];
+	for (GTBranch *branch in localBranches) {
+		BOOL success = NO;
+		GTBranch *trackingBranch = [branch trackingBranchWithError:error success:&success];
+		if (!success) continue;
+
+		[remoteBranches removeObject:trackingBranch];
+		[branches addObject:branch];
+	}
+
+	[branches addObjectsFromArray:remoteBranches];
+
+	return branches;
+}
+
 - (NSArray *)remoteNamesWithError:(NSError **)error {
 	git_strarray array;
 	int gitError = git_remote_list(&array, self.git_repository);