Merge refinements to GTRepository.shouldIgnoreFileURL from in-progress pull request

Author: onecrayon

ObjectiveGit/GTRepository+Status.m

@@ -126,9 +126,12 @@ - (BOOL)shouldFileBeIgnored:(NSURL *)fileURL success:(BOOL *)success error:(NSEr
 }
 
 - (GTFileIgnoreState)shouldIgnoreFileURL:(NSURL *)fileURL error:(NSError **)error {
-	BOOL success = false;
+	BOOL success = NO;
 	BOOL ignore = [self shouldFileBeIgnored:fileURL success:&success error:error];
-	return ignore && success ? GTFileIgnoreStateShouldIgnore : (!ignore && success ? GTFileIgnoreStateShouldNotIgnore : GTFileIgnoreStateIgnoreCheckFailed);
+	if (success) {
+		return (ignore ? GTFileIgnoreStateShouldIgnore : GTFileIgnoreStateShouldNotIgnore);
+	}
+	return GTFileIgnoreStateIgnoreCheckFailed;
 }
 
 @end

ObjectiveGitTests/GTRepository+StatusSpec.m

@@ -105,6 +105,24 @@
 		expect(@(enumerationSuccessful)).to(beTruthy());
 		expect(err).to(beNil());
 	});
+	
+	it(@"should report file should be ignored", ^{
+		__block NSError *err = nil;
+		NSURL *fileURL = [repository.fileURL URLByAppendingPathComponent:@".DS_Store"];
+		BOOL success = NO;
+		BOOL shouldIgnore = [repository shouldFileBeIgnored:fileURL success:&success error:&err];
+		expect(@(success)).to(beTrue());
+		expect(@(shouldIgnore)).to(beTrue());
+		expect(err).to(beNil());
+	});
+	
+	it(@"should report file should be ignored (convenience wrapper)", ^{
+		__block NSError *err = nil;
+		NSURL *fileURL = [repository.fileURL URLByAppendingPathComponent:@".DS_Store"];
+		GTFileIgnoreState ignore = [repository shouldIgnoreFileURL:fileURL error:&err];
+		expect(@(ignore)).to(equal(@(GTFileIgnoreStateShouldIgnore)));
+		expect(err).to(beNil());
+	});
 });
 
 afterEach(^{