Merge pull request #512 from phatblat/ben/targetCommitAndReturnError

joshaber · joshaber · commit b7b25499749a · 2015-08-31T11:51:51.000-05:00
Remove deprecated targetCommitAndReturnError
diff --git a/ObjectiveGit/GTBranch.h b/ObjectiveGit/GTBranch.h
@@ -132,9 +132,6 @@ NS_ASSUME_NONNULL_BEGIN
 /// Returns whether the calculation was successful.
 - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBranch *)branch error:(NSError **)error;
 
-#pragma mark Deprecations
-- (nullable GTCommit *)targetCommitAndReturnError:(NSError **)error __deprecated_msg("use targetCommitWithError: instead.");
-
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/ObjectiveGit/GTBranch.m b/ObjectiveGit/GTBranch.m
@@ -223,9 +223,4 @@ - (BOOL)calculateAhead:(size_t *)ahead behind:(size_t *)behind relativeTo:(GTBra
 	return [self.repository calculateAhead:ahead behind:behind ofOID:self.OID relativeToOID:branch.OID error:error];
 }
 
-#pragma mark Deprecations
-- (GTCommit *)targetCommitAndReturnError:(NSError **)error {
-	return [self targetCommitWithError:error];
-}
-
 @end

Original file line number	Diff line number	Diff line change
`@@ -223,9 +223,4 @@ - (BOOL)calculateAhead:(size_t )ahead behind:(size_t )behind relativeTo:(GTBra`
`223`	`223`	`return [self.repository calculateAhead:ahead behind:behind ofOID:self.OID relativeToOID:branch.OID error:error];`
`224`	`224`	`}`
`225`	`225`
`226`		`-#pragma mark Deprecations`
`227`		`-- (GTCommit )targetCommitAndReturnError:(NSError *)error {`
`228`		`- return [self targetCommitWithError:error];`
`229`		`-}`
`230`		`-`
`231`	`226`	`@end`