Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Revert "Revert "Merge pull request #86 from rowanj/update-libgit2""
This reverts commit da139e4.
  • Loading branch information
jspahrsummers committed Sep 13, 2012
1 parent 0c9fafd commit 48f047b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Classes/GTBranch.m
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion Classes/GTEnumerator.m
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion Classes/GTTreeEntry.m
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion libgit2
Submodule libgit2 updated 477 files

0 comments on commit 48f047b

Please sign in to comment.