8000 Remove deprecated targetCommitAndReturnError by phatblat · Pull Request #512 · libgit2/objective-git · GitHub
[go: up one dir, main page]
Skip to content

Remove deprecated targetCommitAndReturnError #512

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 31, 2015
Merged

Remove deprecated targetCommitAndReturnError #512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Remove deprecated targetCommitAndReturnError 
Conflicts with the non-deprecated method in Swift 2 (Xcode 7b6)

error: ambiguous use of 'targetCommit()'
                    let gt_commit = try! gt_branch.targetCommit()
                                         ^
ObjectiveGit.GTBranch:38:14: note: found this candidate
  @objc func targetCommit() throws -> GTCommit
             ^
ObjectiveGit.GTBranch:86:14: note: found this candidate
  @objc func targetCommit() throws -> GTCommit
  • Loading branch information
@phatblat
phatblat committed Aug 24, 2015
commit 03a2485b79e9d91561b4e3c57ac4346523c69d83
3 changes: 0 additions & 3 deletions ObjectiveGit/GTBranch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 0 additions & 5 deletions ObjectiveGit/GTBranch.m
View file
Open in desktop
60C3
Original file line number Diff line number Diff line change
Expand Up @@ -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
0