wip

bots-common/git_utils.go

@@ -688,13 +688,6 @@ func (e *GitHandlerImpl) GitSubmoduleList(gitPath, commitId string) (submoduleLi
 }
 
 func (e *GitHandlerImpl) GitSubmoduleCommitId(cwd, packageName, commitId string) (subCommitId string, valid bool) {
-	defer func() {
-		if recover() != nil {
-			commitId = ""
-			valid = false
-		}
-	}()
-
 	data_in, data_out := ChanIO{make(chan byte, 256)}, ChanIO{make(chan byte, 70)}
 	var wg sync.WaitGroup
 
@@ -705,6 +698,14 @@ func (e *GitHandlerImpl) GitSubmoduleCommitId(cwd, packageName, commitId string)
 	}
 
 	go func() {
+		defer func() {
+			if recover() != nil {
+				subCommitId = "wrong"
+				commitId = "ok"
+				valid = false
+			}
+		}()
+
 		defer wg.Done()
 		defer close(data_out.ch)