Skip to content

Commit 46919bc

Browse files
committed
Merge pull request #455 from sagmor/patch-1
Fix entryWithPath:error: on GTTree
2 parents 7d8d8fa + b289b66 commit 46919bc

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

ObjectiveGit/GTTree.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ - (GTTreeEntry *)entryWithName:(NSString *)name {
7171
- (GTTreeEntry *)entryWithPath:(NSString *)path error:(NSError **)error {
7272
git_tree_entry *internalEntry = NULL;
7373
int gitError = git_tree_entry_bypath(&internalEntry, self.git_tree, path.UTF8String);
74-
if (error != GIT_OK) {
74+
if (gitError != GIT_OK) {
7575
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get tree entry %@", path];
7676
return nil;
7777
}

ObjectiveGitTests/GTTreeSpec.m

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,30 @@
9999
expect([tree entryWithName:@"_does not exist"]).to(beNil());
100100
});
101101

102+
describe(@"fetching entries from paths", ^{
103+
it(@"should be able to fetch existing paths",^{
104+
NSError *error = nil;
105+
GTTreeEntry *entry;
106+
107+
entry = [tree entryWithPath:@"README" error:&error];
108+
expect(error).to(beNil());
109+
expect(entry).notTo(beNil());
110+
111+
entry = [tree entryWithPath:@"subdir/README" error:&error];
112+
expect(error).to(beNil());
113+
expect(entry).notTo(beNil());
114+
});
115+
116+
it(@"should return nil and fill error for non-existent paths",^{
117+
NSError *error = nil;
118+
GTTreeEntry *entry;
119+
120+
entry = [tree entryWithPath:@"does/not/exist" error:&error];
121+
expect(error).notTo(beNil());
122+
expect(entry).to(beNil());
123+
});
124+
});
125+
102126
afterEach(^{
103127
[self tearDown];
104128
});

0 commit comments

Comments
 (0)