Goodwowo
diff --git a/‎Coding_iOS/Models/Login.m‎
Lines changed: 1 addition & 1 deletion b/‎Coding_iOS/Models/Login.m‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Coding_iOS/Models/Project.m‎
Lines changed: 21 additions & 12 deletions b/‎Coding_iOS/Models/Project.m‎
Lines changed: 21 additions & 12 deletions
@@ -40,7 +40,7 @@ - (NSDictionary *)toParams{
     if (self.j_captcha.length > 0) {
         params[@"j_captcha"] = self.j_captcha;
     }
-    [Login p_setPassword:self.password forAccount:self.email];//保存一下密码
+    [Login p_setPassword:self.password forAccount:self.email.lowercaseString];//保存一下密码
     return params;
 }
 
 
@@ -220,24 +220,33 @@ - (void)gitPullBlock:(void(^)(BOOL result, NSString *tipStr))handleBlock progres
         }else{
             GTConfiguration *configuration = [repo configurationWithError:nil];
             GTRemote *remote = configuration.remotes.firstObject;
-            BOOL success = NO;
-            GTBranch *masterBranch = [repo lookUpBranchWithName:@"master" type:GTBranchTypeLocal success:&success error:nil];
-            if (!remote || !masterBranch) {
+            if (!remote) {
                 handleBlock(NO, @"仓库信息不完整");
             }else{
                 __weak typeof(self) weakSelf = self;
                 dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
-                    NSMutableDictionary *options = @{GTRepositoryRemoteOptionsDownloadTags: @(GTRemoteDownloadTagsAuto)}.mutableCopy;
-                    if (weakSelf.is_public && !weakSelf.is_public.boolValue) {//私有项目
-                        options[GTRepositoryRemoteOptionsCredentialProvider] = [weakSelf.class p_credentialProvider];
-                    }
                     NSError *error = nil;
-                    BOOL result = [repo pullBranch:masterBranch fromRemote:remote withOptions:options error:&error progress:progressBlock];
-                    dispatch_async(dispatch_get_main_queue(), ^{
-                        if (handleBlock) {
-                            handleBlock(result, error.localizedDescription);
+                    NSArray<GTBranch *> *branchList = [repo localBranchesWithError:&error];
+                    if (branchList.count > 0) {
+                        GTBranch *curBranch = branchList.firstObject;
+                        NSMutableDictionary *options = @{GTRepositoryRemoteOptionsDownloadTags: @(GTRemoteDownloadTagsAuto)}.mutableCopy;
+                        if (weakSelf.is_public && !weakSelf.is_public.boolValue) {//私有项目
+                            options[GTRepositoryRemoteOptionsCredentialProvider] = [weakSelf.class p_credentialProvider];
                         }
-                    });
+                        NSError *error = nil;
+                        BOOL result = [repo pullBranch:curBranch fromRemote:remote withOptions:options error:&error progress:progressBlock];
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            if (handleBlock) {
+                                handleBlock(result, error.localizedDescription);
+                            }
+                        });
+                    }else{
+                        dispatch_async(dispatch_get_main_queue(), ^{
+                            if (handleBlock) {
+                                handleBlock(NO, @"本地分支为空，请删除后，重新 clone 代码");
+                            }
+                        });
+                    }
                 });
             }
         }
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ - (NSDictionary *)toParams{`
`40`	`40`	`if (self.j_captcha.length > 0) {`
`41`	`41`	`params[@"j_captcha"] = self.j_captcha;`
`42`	`42`	`}`
`43`		`- [Login p_setPassword:self.password forAccount:self.email];//保存一下密码`
	`43`	`+ [Login p_setPassword:self.password forAccount:self.email.lowercaseString];//保存一下密码`
`44`	`44`	`return params;`
`45`	`45`	`}`
`46`	`46`