Merge pull request brotherbard#52 from darconeous/error-on-repo-open-fix

Error on repo open fix

Author: laullon

PBGitRepository.m

@@ -118,6 +118,7 @@ + (NSURL*)baseDirForURL:(NSURL*)repositoryURL;
 //this works much better.
 - (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSError **)outError
 {
+	@try {
 	if (![PBGitBinary path])
 	{
 		if (outError) {
@@ -153,6 +154,14 @@ - (BOOL)readFromURL:(NSURL *)absoluteURL ofType:(NSString *)typeName error:(NSEr
 	[self setFileURL:gitDirURL];
 	[self setup];
 	return YES;
+	} @catch(id x) {
+		if (outError) {
+			NSDictionary* userInfo = [NSDictionary dictionaryWithObject:[NSString stringWithFormat:@"An error occured while trying to open %@.\n%@", [self fileURL],x]
+																 forKey:NSLocalizedRecoverySuggestionErrorKey];
+			*outError = [NSError errorWithDomain:PBGitRepositoryErrorDomain code:0 userInfo:userInfo];
+		}
+		return NO;
+	}
 }
 
 - (void) setup
@@ -271,6 +280,11 @@ - (void) addRef: (PBGitRef *) ref fromParameters: (NSArray *) components
 	else
 		sha = [PBGitSHA shaWithString:[components objectAtIndex:2]];
 
+	if(!sha) {
+		NSLog(@"sha was nil...? ref=%@, components=%@",ref,components);
+		return;
+	}
+
 	NSMutableArray* curRefs;
 	if ( (curRefs = [refs objectForKey:sha]) != nil )
 		[curRefs addObject:ref];
@@ -290,6 +304,13 @@ - (void) reloadRefs
 	NSString *output = [self outputForArguments:arguments];
 	NSArray *lines = [output componentsSeparatedByString:@"\n"];
 
+	if([output hasPrefix:@"fatal: "]) {
+		NSLog(@"Unable to read refs!");
+		NSLog(@"arguments=%@",arguments);
+		NSLog(@"output=%@",output);
+		@throw output;
+	}
+
 	for (NSString *line in lines) {
 		// If its an empty line, skip it (e.g. with empty repositories)
 		if ([line length] == 0)