Merge pull request #6176 from tonistiigi/remove-ref-initialize

dfgitutil: don't initialize ref from checksum

Author: tonistiigi

frontend/dockerfile/dfgitutil/git_ref.go

@@ -176,8 +176,5 @@ func (gf *GitRef) loadQuery(query url.Values) error {
 		}
 		gf.Ref = branch
 	}
-	if gf.Checksum != "" && gf.Ref == "" {
-		gf.Ref = gf.Checksum
-	}
 	return nil
 }

frontend/dockerfile/dockerfile_addgit_test.go

@@ -472,11 +472,26 @@ COPY foo out
 			url:       serverURL + "/.git?commit=" + commitHashV2,
 			expectOut: "v0.0.2\n",
 		},
+		{
+			name:      "v2 by commit (wrong short)",
+			url:       serverURL + "/.git?commit=" + commitHashV2[:8],
+			expectErr: "expected checksum to match",
+		},
+		{
+			name:      "v2 by commit (short)",
+			url:       serverURL + "/.git?commit=" + commitHashLatest[:8],
+			expectOut: "latest\n",
+		},
 		{
 			name:      "v2 ref by commit",
 			url:       serverURL + "/.git?ref=" + commitHashV2,
 			expectOut: "v0.0.2\n",
 		},
+		{
+			name:      "v2 ref by commit (short)",
+			url:       serverURL + "/.git?ref=" + commitHashV2[:8],
+			expectErr: "repository does not contain ref",
+		},
 		{
 			name:      "tag with commit",
 			url:       serverURL + "/.git?tag=v0.0.2&commit=" + commitHashV2,