Permalink
Browse files

Revert "Revert "Merge pull request #86 from rowanj/update-libgit2""

This reverts commit da139e4.
  • Loading branch information...
1 parent 0c9fafd commit 48f047b55183cd533b0ccfd5b7b5466da863e3a5 @jspahrsummers jspahrsummers committed Sep 13, 2012
Showing with 4 additions and 4 deletions.
  1. +1 −1 Classes/GTBranch.m
  2. +1 −1 Classes/GTEnumerator.m
  3. +1 −1 Classes/GTTreeEntry.m
  4. +1 −1 libgit2
View
@@ -218,7 +218,7 @@ - (NSArray *)uniqueCommitsRelativeToBranch:(GTBranch *)otherBranch error:(NSErro
}
- (BOOL)deleteWithError:(NSError **)error {
- int gitError = git_branch_delete(self.repository.git_repository, [self.name UTF8String], GIT_BRANCH_LOCAL);
+ int gitError = git_branch_delete(self.reference.git_reference);
if(gitError != GIT_OK) {
if(error != NULL) *error = [NSError git_errorFor:gitError withAdditionalDescription:@"Failed to delete branch."];
return NO;
@@ -134,7 +134,7 @@ - (id)nextObject {
- (id)nextObjectWithError:(NSError **)error {
git_oid oid;
int gitError = git_revwalk_next(&oid, self.walk);
- if(gitError == GIT_REVWALKOVER)
+ if(gitError == GIT_ITEROVER)
return nil;
// ignore error if we can't lookup object and just return nil
@@ -73,7 +73,7 @@ - (NSString *)name {
}
- (NSInteger)attributes {
- return git_tree_entry_attributes(self.git_tree_entry);
+ return git_tree_entry_filemode(self.git_tree_entry);
}
- (NSString *)sha {
Submodule libgit2 updated 477 files

0 comments on commit 48f047b

Please sign in to comment.