fix for git error: No submodule mapping found in .gitmodules for path "..."

This commit is contained in:
apla
2011-03-30 09:30:36 +04:00
parent f0f5c916dd
commit 18027a02ef
3 changed files with 8 additions and 2 deletions
+2 -1
View File
@@ -42,7 +42,8 @@
if ([submoduleLine length] == 0)
continue;
PBGitSubmodule *submodule = [[PBGitSubmodule alloc] initWithRawSubmoduleStatusString:submoduleLine];
[loadedSubmodules addObject:submodule];
if (submodule)
[loadedSubmodules addObject:submodule];
}
NSMutableArray *groupedSubmodules = [[NSMutableArray alloc] init];
+1
View File
@@ -13,6 +13,7 @@ typedef enum {
PBGitSubmoduleStateNotInitialized,
PBGitSubmoduleStateMatchingIndex,
PBGitSubmoduleStateDoesNotMatchIndex,
PBGitSubmoduleStateFailed,
} PBGitSubmoduleState;
@interface PBGitSubmodule : NSObject<PBPresentable> {
+5 -1
View File
@@ -35,6 +35,10 @@
if ((self = [super init])) {
unichar status = [submoduleStatusString characterAtIndex:0];
submoduleState = [PBGitSubmodule submoduleStateFromCharacter:status];
if (submoduleState == PBGitSubmoduleStateFailed) {
NSLog(@"Submodule status failed:\n %@", submoduleStatusString);
return nil;
}
NSScanner *scanner = [NSScanner scannerWithString:[submoduleStatusString substringFromIndex:1]];
NSString *sha1 = nil;
NSString *fullPath = nil;
@@ -114,7 +118,7 @@
} else if (character == '+') {
state = PBGitSubmoduleStateDoesNotMatchIndex;
} else if (character != ' ') {
NSAssert1(NO, @"Ooops unsupported submodule status character: %c", character);
return PBGitSubmoduleStateFailed;
}
return state;