fix: fix fetching commit SHAs (argoproj#5312)

Signed-off-by: Alexander Matyushentsev <Alexander_Matyushentsev@intuit.com>
alexmt · Jan 26, 2021 · 7afeda5 · 7afeda5
1 parent d8b545d
commit 7afeda5
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/reposerver/repository/repository.go b/reposerver/repository/repository.go
@@ -1336,14 +1336,28 @@ func checkoutRevision(gitClient git.Client, revision string) error {
 	if err != nil {
 		return status.Errorf(codes.Internal, "Failed to initialize git repo: %v", err)
 	}
-	err = gitClient.Fetch(revision)
-	if err != nil {
-		return status.Errorf(codes.Internal, "Failed to fetch %s: %v", revision, err)
-	}
-	err = gitClient.Checkout("FETCH_HEAD")
-	if err != nil {
-		return status.Errorf(codes.Internal, "Failed to checkout FETCH_HEAD: %v", err)
+
+	// Some git providers don't support fetching commit sha
+	if revision != "" && !git.IsCommitSHA(revision) && !git.IsTruncatedCommitSHA(revision) {
+		err = gitClient.Fetch(revision)
+		if err != nil {
+			return status.Errorf(codes.Internal, "Failed to fetch %s: %v", revision, err)
+		}
+		err = gitClient.Checkout("FETCH_HEAD")
+		if err != nil {
+			return status.Errorf(codes.Internal, "Failed to checkout FETCH_HEAD: %v", err)
+		}
+	} else {
+		err = gitClient.Fetch("")
+		if err != nil {
+			return status.Errorf(codes.Internal, "Failed to fetch %s: %v", revision, err)
+		}
+		err = gitClient.Checkout(revision)
+		if err != nil {
+			return status.Errorf(codes.Internal, "Failed to checkout %s: %v", revision, err)
+		}
 	}
+
 	return err
 }
 

diff --git a/util/git/client.go b/util/git/client.go
@@ -263,8 +263,7 @@ func (m *nativeGitClient) IsLFSEnabled() bool {
 // Fetch fetches latest updates from origin
 func (m *nativeGitClient) Fetch(revision string) error {
 	var err error
-	// Some git providers don't support fetching commit sha
-	if revision != "" && !IsCommitSHA(revision) && !IsTruncatedCommitSHA(revision) {
+	if revision != "" {
 		err = m.runCredentialedCmd("git", "fetch", "origin", revision, "--tags", "--force")
 	} else {
 		err = m.runCredentialedCmd("git", "fetch", "origin", "--tags", "--force")