From 48f047b55183cd533b0ccfd5b7b5466da863e3a5 Mon Sep 17 00:00:00 2001 From: Justin Spahr-Summers Date: Thu, 13 Sep 2012 14:40:46 -0700 Subject: [PATCH] Revert "Revert "Merge pull request #86 from rowanj/update-libgit2"" This reverts commit da139e48fd472fa4d81ebd33eab01540fbb0cd31. --- Classes/GTBranch.m | 2 +- Classes/GTEnumerator.m | 2 +- Classes/GTTreeEntry.m | 2 +- libgit2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Classes/GTBranch.m b/Classes/GTBranch.m index 98913702f..9c6748633 100644 --- a/Classes/GTBranch.m +++ b/Classes/GTBranch.m @@ -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; diff --git a/Classes/GTEnumerator.m b/Classes/GTEnumerator.m index b621fe8d4..4d4bab36c 100644 --- a/Classes/GTEnumerator.m +++ b/Classes/GTEnumerator.m @@ -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 diff --git a/Classes/GTTreeEntry.m b/Classes/GTTreeEntry.m index 6d1f62629..2cd2d1e13 100644 --- a/Classes/GTTreeEntry.m +++ b/Classes/GTTreeEntry.m @@ -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 { diff --git a/libgit2 b/libgit2 index d96c3863a..21d847d38 160000 --- a/libgit2 +++ b/libgit2 @@ -1 +1 @@ -Subproject commit d96c3863a50f2a9b0f33735911e5472fec3ad288 +Subproject commit 21d847d38ffd5055ffbcaabebf115edbee8e8b94