#no #nils #nonils

joshaber · joshaber · commit e051eff3ee34 · 2014-11-17T13:31:00.000-05:00
diff --git a/ObjectiveGit/GTRepository.m b/ObjectiveGit/GTRepository.m
@@ -411,7 +411,7 @@ - (NSArray *)branches:(NSError **)error {
 	NSMutableArray *branches = [NSMutableArray array];
 	for (GTBranch *branch in localBranches) {
 		GTBranch *trackingBranch = [branch trackingBranchWithError:NULL success:NULL];
-		[remoteBranches removeObject:trackingBranch];
+		if (trackingBranch != nil) [remoteBranches removeObject:trackingBranch];
 		[branches addObject:branch];
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -411,7 +411,7 @@ - (NSArray )branches:(NSError *)error {`
`411`	`411`	`NSMutableArray *branches = [NSMutableArray array];`
`412`	`412`	`for (GTBranch *branch in localBranches) {`
`413`	`413`	`GTBranch *trackingBranch = [branch trackingBranchWithError:NULL success:NULL];`
`414`		`- [remoteBranches removeObject:trackingBranch];`
	`414`	`+ if (trackingBranch != nil) [remoteBranches removeObject:trackingBranch];`
`415`	`415`	`[branches addObject:branch];`
`416`	`416`	`}`
`417`	`417`