Merge pull request #24433 from cuyl/fix-git-fetch

fix: fetch error with depth 1
kubernetes · Nov 23, 2021 · 62adef3 · 62adef3
2 parents dd34e73 + ffa529b
commit 62adef3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 10 deletions.
diff --git a/prow/pod-utils/clone/clone.go b/prow/pod-utils/clone/clone.go
@@ -238,18 +238,22 @@ func (g *gitCtx) commandsForBaseRef(refs prowapi.Refs, gitUserName, gitUserEmail
 		commands = append(commands, g.gitFetch(fetchArgs...))
 	}
 
-	{
-		fetchArgs := append([]string{}, depthArgs...)
-		fetchArgs = append(fetchArgs, g.repositoryURI, refs.BaseRef)
-		commands = append(commands, g.gitFetch(fetchArgs...))
-	}
-
+	var fetchRef string
 	var target string
 	if refs.BaseSHA != "" {
+		fetchRef = refs.BaseSHA
 		target = refs.BaseSHA
 	} else {
+		fetchRef = refs.BaseRef
 		target = "FETCH_HEAD"
 	}
+
+	{
+		fetchArgs := append([]string{}, depthArgs...)
+		fetchArgs = append(fetchArgs, g.repositoryURI, fetchRef)
+		commands = append(commands, g.gitFetch(fetchArgs...))
+	}
+
 	// we need to be "on" the target branch after the sync
 	// so we need to set the branch to point to the base ref,
 	// but we cannot update a branch we are on, so in case we

diff --git a/prow/pod-utils/clone/clone_test.go b/prow/pod-utils/clone/clone_test.go
@@ -425,7 +425,7 @@ func TestCommandsForRefs(t *testing.T) {
 					fetchRetries,
 				},
 				retryCommand{
-					cloneCommand{dir: "/go/src/github.com/org/repo", command: "git", args: []string{"fetch", "https://github.com/org/repo.git", "master"}},
+					cloneCommand{dir: "/go/src/github.com/org/repo", command: "git", args: []string{"fetch", "https://github.com/org/repo.git", "abcdef"}},
 					fetchRetries,
 				},
 				cloneCommand{dir: "/go/src/github.com/org/repo", command: "git", args: []string{"checkout", "abcdef"}},
@@ -635,7 +635,7 @@ func TestCommandsForRefs(t *testing.T) {
 					fetchRetries,
 				},
 				retryCommand{
-					cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"fetch", "https://github.enterprise.com/org/repo.git", "master"}},
+					cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"fetch", "https://github.enterprise.com/org/repo.git", "abcdef"}},
 					fetchRetries,
 				},
 				cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"checkout", "abcdef"}},
@@ -661,7 +661,7 @@ func TestCommandsForRefs(t *testing.T) {
 				cloneCommand{dir: "/", command: "mkdir", args: []string{"-p", "/go/src/github.enterprise.com/org/repo"}},
 				cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"init"}},
 				retryCommand{
-					cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"fetch", "https://github.enterprise.com/org/repo.git", "master"}},
+					cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"fetch", "https://github.enterprise.com/org/repo.git", "abcdef"}},
 					fetchRetries,
 				},
 				cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"checkout", "abcdef"}},
@@ -688,7 +688,7 @@ func TestCommandsForRefs(t *testing.T) {
 				cloneCommand{dir: "/", command: "mkdir", args: []string{"-p", "/go/src/github.enterprise.com/org/repo"}},
 				cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"init"}},
 				retryCommand{
-					cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"fetch", "--depth", "2", "https://github.enterprise.com/org/repo.git", "master"}},
+					cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"fetch", "--depth", "2", "https://github.enterprise.com/org/repo.git", "abcdef"}},
 					fetchRetries,
 				},
 				cloneCommand{dir: "/go/src/github.enterprise.com/org/repo", command: "git", args: []string{"checkout", "abcdef"}},