Skip to content

Commit dea9507

Browse files
committed
Fix stash tests
1 parent 84fd119 commit dea9507

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

ObjectiveGitTests/GTRepositoryStashingSpec.m

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@
129129
expect(error).to(beNil());
130130

131131
__block BOOL progressCalled = NO;
132-
BOOL success = [repository applyStashAtIndex:0 flags:GTRepositoryStashApplyFlagDefault error:&error progressBlock:^void(GTRepositoryStashApplyProgress step, BOOL *stop) {
132+
BOOL success = [repository applyStashAtIndex:0 flags:GTRepositoryStashApplyFlagDefault checkoutOptions:nil error:&error progressBlock:^void(GTRepositoryStashApplyProgress step, BOOL *stop) {
133133
progressCalled = YES;
134134
}];
135135
expect(@(success)).to(beTruthy());
@@ -162,7 +162,7 @@
162162
lastStashIndex = index;
163163
}];
164164

165-
success = [repository applyStashAtIndex:(lastStashIndex + 1) flags:GTRepositoryStashApplyFlagDefault error:&error progressBlock:nil];
165+
success = [repository applyStashAtIndex:(lastStashIndex + 1) flags:GTRepositoryStashApplyFlagDefault checkoutOptions:nil error:&error progressBlock:nil];
166166
expect(@(success)).to(beFalsy());
167167
expect(error).notTo(beNil());
168168
expect(error.domain).to(equal(GTGitErrorDomain));
@@ -186,7 +186,7 @@
186186

187187
expect(@([@"barfoo" writeToURL:[repository.fileURL URLByAppendingPathComponent:@"new-test-file"] atomically:YES encoding:NSUTF8StringEncoding error:NULL])).to(beTruthy());
188188

189-
BOOL success = [repository applyStashAtIndex:0 flags:GTRepositoryStashApplyFlagDefault error:&error progressBlock:nil];
189+
BOOL success = [repository applyStashAtIndex:0 flags:GTRepositoryStashApplyFlagDefault checkoutOptions:nil error:&error progressBlock:nil];
190190
expect(@(success)).to(beFalsy());
191191
expect(error).notTo(beNil());
192192

0 commit comments

Comments
 (0)