Skip to content

Commit ed33a45

Browse files
committed
APIs changed.
1 parent c7f658a commit ed33a45

File tree

2 files changed

+4
-25
lines changed

2 files changed

+4
-25
lines changed

ObjectiveGit/GTSubmodule.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ - (GTSubmoduleIgnoreRule)ignoreRule {
2626
}
2727

2828
- (void)setIgnoreRule:(GTSubmoduleIgnoreRule)ignoreRule {
29-
git_submodule_set_ignore(self.git_submodule, (git_submodule_ignore_t)ignoreRule);
29+
git_submodule_set_ignore(self.parentRepository.git_repository, git_submodule_name(self.git_submodule), (git_submodule_ignore_t)ignoreRule);
3030
}
3131

3232
- (GTOID *)indexOID {
@@ -96,7 +96,7 @@ - (instancetype)initWithGitSubmodule:(git_submodule *)submodule parentRepository
9696

9797
- (GTSubmoduleStatus)status:(NSError **)error {
9898
unsigned status;
99-
int gitError = git_submodule_status(&status, self.git_submodule);
99+
int gitError = git_submodule_status(&status, self.parentRepository.git_repository, git_submodule_name(self.git_submodule), git_submodule_ignore(self.git_submodule));
100100
if (gitError != GIT_OK) {
101101
if (error != NULL) *error = [NSError git_errorFor:gitError description:@"Failed to get submodule %@ status.", self.name];
102102
return GTSubmoduleStatusUnknown;

ObjectiveGitTests/GTSubmoduleSpec.m

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
expect(repo).notTo(beNil());
2222
});
2323

24-
it(@"should enumerate top-level submodules", ^{
24+
fit(@"should enumerate top-level submodules", ^{
2525
NSMutableSet *names = [NSMutableSet set];
2626
[repo enumerateSubmodulesRecursively:NO usingBlock:^(GTSubmodule *submodule, NSError *error, BOOL *stop) {
2727
expect(submodule).to(beAnInstanceOf(GTSubmodule.class));
@@ -67,8 +67,7 @@
6767
expect(submodule).notTo(beNil());
6868
expect(@(git_submodule_url(submodule.git_submodule))).notTo(equal(testURLString));
6969

70-
git_submodule_set_url(submodule.git_submodule, testURLString.UTF8String);
71-
git_submodule_save(submodule.git_submodule);
70+
git_submodule_set_url(repo.git_repository, git_submodule_name(submodule.git_submodule), testURLString.UTF8String);
7271

7372
__block NSError *error = nil;
7473
expect(@([submodule writeToParentConfigurationDestructively:YES error:&error])).to(beTruthy());
@@ -79,26 +78,6 @@
7978
expect(@(git_submodule_url(submodule.git_submodule))).to(equal(testURLString));
8079
});
8180

82-
it(@"should reload all submodules", ^{
83-
GTSubmodule *submodule = [repo submoduleWithName:@"new_submodule" error:NULL];
84-
expect(submodule).to(beNil());
85-
86-
NSURL *gitmodulesURL = [repo.fileURL URLByAppendingPathComponent:@".gitmodules"];
87-
NSMutableString *gitmodules = [NSMutableString stringWithContentsOfURL:gitmodulesURL usedEncoding:NULL error:NULL];
88-
expect(gitmodules).notTo(beNil());
89-
90-
[gitmodules appendString:@"[submodule \"new_submodule\"]\n\turl = some_url\n\tpath = new_submodule_path"];
91-
expect(@([gitmodules writeToURL:gitmodulesURL atomically:YES encoding:NSUTF8StringEncoding error:NULL])).to(beTruthy());
92-
93-
__block NSError *error = nil;
94-
expect(@([repo reloadSubmodules:&error])).to(beTruthy());
95-
expect(error).to(beNil());
96-
97-
submodule = [repo submoduleWithName:@"new_submodule" error:NULL];
98-
expect(submodule).notTo(beNil());
99-
expect(submodule.path).to(equal(@"new_submodule_path"));
100-
});
101-
10281
it(@"should add its HEAD to its parent's index", ^{
10382
GTSubmodule *submodule = [repo submoduleWithName:@"Test_App" error:NULL];
10483
expect(submodule).notTo(beNil());

0 commit comments

Comments
 (0)