mirror of
https://github.com/kennethreitz-archive/gitx.git
synced 2026-06-05 15:30:18 +00:00
fix for git error: No submodule mapping found in .gitmodules for path "..."
This commit is contained in:
@@ -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];
|
||||
|
||||
@@ -13,6 +13,7 @@ typedef enum {
|
||||
PBGitSubmoduleStateNotInitialized,
|
||||
PBGitSubmoduleStateMatchingIndex,
|
||||
PBGitSubmoduleStateDoesNotMatchIndex,
|
||||
PBGitSubmoduleStateFailed,
|
||||
} PBGitSubmoduleState;
|
||||
|
||||
@interface PBGitSubmodule : NSObject<PBPresentable> {
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user