Clone submodules tweaks (#119)

* Only update submodules after potential hard reset is done

* Print submodule names when updating

Makes it easier to debug which one of the submodules caused the error.

Author: edigaryev

internal/executor/executor.go

@@ -499,53 +499,60 @@ func (executor *Executor) CloneRepository(env map[string]string) bool {
 		return false
 	}
 
-	if is_clone_modules {
-		logUploader.Write([]byte("\nUpdating submodules..."))
+	if ref.Hash() != plumbing.NewHash(change) {
+		logUploader.Write([]byte(fmt.Sprintf("\nHEAD is at %s.", ref.Hash())))
+		logUploader.Write([]byte(fmt.Sprintf("\nHard resetting to %s...", change)))
 
 		workTree, err := repo.Worktree()
 		if err != nil {
 			logUploader.Write([]byte(fmt.Sprintf("\nFailed to get work tree: %s!", err)))
 			return false
 		}
 
-		submodules, err := workTree.Submodules()
+		err = workTree.Reset(&git.ResetOptions{
+			Commit: plumbing.NewHash(change),
+			Mode:   git.HardReset,
+		})
 		if err != nil {
-			logUploader.Write([]byte(fmt.Sprintf("\nFailed to get submodules: %s!", err)))
-			return false
-		}
-
-		if err := submodules.Update(&git.SubmoduleUpdateOptions{
-			Init:              true,
-			RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
-		}); err != nil {
-			logUploader.Write([]byte(fmt.Sprintf("\nFailed to update submodules: %s!", err)))
+			logUploader.Write([]byte(fmt.Sprintf("\nFailed to force reset to %s: %s!", change, err)))
 			return false
 		}
-
-		logUploader.Write([]byte("\nSucessfully updated submodules!"))
 	}
 
-	if ref.Hash() != plumbing.NewHash(change) {
-		logUploader.Write([]byte(fmt.Sprintf("\nHEAD is at %s.", ref.Hash())))
-		logUploader.Write([]byte(fmt.Sprintf("\nHard resetting to %s...", change)))
+	if is_clone_modules {
+		logUploader.Write([]byte("\nUpdating submodules..."))
 
 		workTree, err := repo.Worktree()
 		if err != nil {
 			logUploader.Write([]byte(fmt.Sprintf("\nFailed to get work tree: %s!", err)))
 			return false
 		}
 
-		err = workTree.Reset(&git.ResetOptions{
-			Commit: plumbing.NewHash(change),
-			Mode:   git.HardReset,
-		})
+		submodules, err := workTree.Submodules()
 		if err != nil {
-			logUploader.Write([]byte(fmt.Sprintf("\nFailed to force reset to %s: %s!", change, err)))
+			logUploader.Write([]byte(fmt.Sprintf("\nFailed to get submodules: %s!", err)))
 			return false
 		}
+
+		opts := &git.SubmoduleUpdateOptions{
+			Init:              true,
+			RecurseSubmodules: git.DefaultSubmoduleRecursionDepth,
+		}
+
+		for _, sub := range submodules {
+			if err := sub.Update(opts); err != nil {
+				logUploader.Write([]byte(fmt.Sprintf("\nFailed to update submodule %q: %s!",
+					sub.Config().Name, err)))
+				return false
+			}
+		}
+
+		logUploader.Write([]byte("\nSucessfully updated submodules!"))
 	}
+
 	logUploader.Write([]byte(fmt.Sprintf("\nChecked out %s on %s branch.", change, branch)))
 	logUploader.Write([]byte("\nSuccessfully cloned!"))
+
 	return true
 }