add orgin back when clone repo (due to git submodule)

charles-chenzz · Oct 1, 2023 · 4b225f6 · 4b225f6
1 parent 45e57f0
commit 4b225f6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/api/internal/git/cloner.go b/api/internal/git/cloner.go
@@ -22,6 +22,10 @@ func ClonerUsingGitExec(repoSpec *RepoSpec) error {
 	if err = r.run("init"); err != nil {
 		return err
 	}
+	// git submodule need origin
+	if err = r.run("remote", "add", "origin", repoSpec.CloneSpec()); err != nil {
+		return err
+	}
 	ref := "HEAD"
 	if repoSpec.Ref != "" {
 		ref = repoSpec.Ref

diff --git a/api/krusty/remoteloader_test.go b/api/krusty/remoteloader_test.go
@@ -205,8 +205,8 @@ resources:
 resources:
 - file://$ROOT/with-submodule.git/submodule?ref=relative-submodule
 `,
-			// TODO(annasong): Replace with simpleBuild once #5131 is fixed.
-			err: `failed to run '\S+/git submodule update --init --recursive'`,
+
+			expected: simpleBuild,
 		},
 		{
 			name: "has timeout",